[errors] de-specialize Transient in favor of Tags.

scheduler/appengine/engine/engine_test.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package engine
 
 import (
         "encoding/json"
         "math/rand"
         "sort"
         "strings"
         "testing"
         "time"
 
         "github.com/golang/protobuf/proto"
         "golang.org/x/net/context"
         "google.golang.org/api/pubsub/v1"
 
         "github.com/luci/gae/impl/memory"
         ds "github.com/luci/gae/service/datastore"
         tq "github.com/luci/gae/service/taskqueue"
 
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/clock/testclock"
         "github.com/luci/luci-go/common/data/rand/mathrand"
         "github.com/luci/luci-go/common/data/stringset"
         "github.com/luci/luci-go/common/errors"
+        "github.com/luci/luci-go/common/retry"
         "github.com/luci/luci-go/server/secrets/testsecrets"
 
         "github.com/luci/luci-go/scheduler/appengine/catalog"
         "github.com/luci/luci-go/scheduler/appengine/messages"
         "github.com/luci/luci-go/scheduler/appengine/task"
         "github.com/luci/luci-go/scheduler/appengine/task/noop"
 
         . "github.com/luci/luci-go/common/testing/assertions"
         . "github.com/smartystreets/goconvey/convey"
 )
@@ skipping 153 matching lines @@
                 e, _ := newTestEngine()
 
                 // Pretend collision happened in all retries.
                 ds.GetTestable(c).SetTransactionRetryCount(15)
                 err := e.UpdateProjectJobs(c, "abc", []catalog.Definition{
                         {
                                 JobID:    "abc/1",
                                 Revision: "rev1",
                                 Schedule: "*/5 * * * * * *",
                         }})
-                So(errors.IsTransient(err), ShouldBeTrue)
+                So(retry.Tag.In(err), ShouldBeTrue)
                 So(allJobs(c), ShouldResemble, []Job{})
                 ensureZeroTasks(c, "timers-q")
                 ensureZeroTasks(c, "invs-q")
         })
 }
 
 func TestResetAllJobsOnDevServer(t *testing.T) {
         Convey("works", t, func() {
                 c := newTestContext(epoch)
                 e, _ := newTestEngine()
@@ skipping 111 matching lines @@
 
                 // Time to run the job and it fails to launch with a transient error.
                 mgr.launchTask = func(ctx context.Context, ctl task.Controller) error {
                         // Check data provided via the controller.
                         So(ctl.JobID(), ShouldEqual, "abc/1")
                         So(ctl.InvocationID(), ShouldEqual, int64(9200093518582198800))
                         So(ctl.InvocationNonce(), ShouldEqual, int64(928953616732700780))
                         So(ctl.Task(), ShouldResemble, &messages.NoopTask{})
 
                         ctl.DebugLog("oops, fail")
-                        return errors.WrapTransient(errors.New("oops"))
+                        return errors.New("oops", retry.Tag)
                 }
-                So(errors.IsTransient(e.ExecuteSerializedAction(c, invTask.Payload, 0)), ShouldBeTrue)
+                So(retry.Tag.In(e.ExecuteSerializedAction(c, invTask.Payload, 0)), ShouldBeTrue)
 
                 // Still in QUEUED state, but with InvocatioID assigned.
                 jobs := allJobs(c)
                 So(jobs, ShouldResemble, []Job{
                         {
                                 JobID:     "abc/1",
                                 ProjectID: "abc",
                                 Revision:  "rev1",
                                 Enabled:   true,
                                 Schedule:  "*/5 * * * * * *",
@@ skipping 392 matching lines @@
                         So(e.ProcessPubSubPush(c, blob), ShouldErrLike, "bad token")
                 })
 
                 Convey("ProcessPubSubPush handles missing invocation", func() {
                         ds.Delete(c, ds.KeyForObj(c, &inv))
                         msg := pubsub.PubsubMessage{
                                 Attributes: map[string]string{"auth_token": token},
                         }
                         blob, err := json.Marshal(&msg)
                         So(err, ShouldBeNil)
-                        So(errors.IsTransient(e.ProcessPubSubPush(c, blob)), ShouldBeFalse)
+                        So(retry.Tag.In(e.ProcessPubSubPush(c, blob)), ShouldBeFalse)
                 })
         })
 }
 
 func TestAborts(t *testing.T) {
         Convey("with mock invocation", t, func() {
                 c := newTestContext(epoch)
                 e, mgr := newTestEngine()
 
                 // A job in "QUEUED" state (about to run an invocation).
@@ skipping 334 matching lines @@
 
 func ensureOneTask(c context.Context, q string) *tq.Task {
         tqt := tq.GetTestable(c)
         tasks := tqt.GetScheduledTasks()[q]
         So(len(tasks), ShouldEqual, 1)
         for _, t := range tasks {
                 return t
         }
         return nil
 }