19388: Remove unneeded import so ctrlctx can import arvadostest.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/ctrlctx/auth_test.go b/lib/ctrlctx/auth_test.go
index 5b0b0679821cf6ec589f178b70d253cf87b0376d..e6803e5c4e80aed79e46bc1ef8ff7ec820cd33f3 100644 (file)
--- a/lib/ctrlctx/auth_test.go
+++ b/lib/ctrlctx/auth_test.go
@@ -8,6 +8,7 @@ import (
        "context"
 
        "git.arvados.org/arvados.git/lib/config"
+       "git.arvados.org/arvados.git/sdk/go/arvadostest"
        "git.arvados.org/arvados.git/sdk/go/auth"
        "git.arvados.org/arvados.git/sdk/go/ctxlog"
        "github.com/jmoiron/sqlx"
@@ -29,10 +30,10 @@ func (*DatabaseSuite) TestAuthContext(c *check.C) {
 
        // valid tokens
        for _, token := range []string{
-               "3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi",
-               "v2/zzzzz-gj3su-077z32aux8dg2s1/3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi",
-               "v2/zzzzz-gj3su-077z32aux8dg2s1/3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi/asdfasdfasdf",
-               "v2/zzzzz-gj3su-077z32aux8dg2s1/3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi", // cached
+               arvadostest.ActiveToken,
+               arvadostest.ActiveTokenV2,
+               arvadostest.ActiveTokenV2 + "/asdfasdfasdf",
+               arvadostest.ActiveTokenV2, // cached
        } {
                ok, err := dbwrapper(authwrapper(func(ctx context.Context, opts interface{}) (interface{}, error) {
                        user, aca, err := CurrentAuth(ctx)
@@ -49,8 +50,10 @@ func (*DatabaseSuite) TestAuthContext(c *check.C) {
 
        // bad tokens
        for _, token := range []string{
-               "3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmI", // note last char mangled
-               "v2/zzzzz-gj3su-077z32aux8dg2s1/",
+               arvadostest.ActiveToken + "X",
+               arvadostest.ActiveTokenV2 + "X",
+               arvadostest.ActiveTokenV2[:30], // "v2/{uuid}"
+               arvadostest.ActiveTokenV2[:31], // "v2/{uuid}/"
                "bogus",
                "",
        } {

diff --git a/sdk/go/arvadostest/db.go b/sdk/go/arvadostest/db.go
index c20f61db26301be6be323d2097be5c55f3d17037..d39f3c6fcbfab8093649ab817612de6bee55b8f7 100644 (file)
--- a/sdk/go/arvadostest/db.go
+++ b/sdk/go/arvadostest/db.go
@@ -5,11 +5,9 @@
 package arvadostest
 
 import (
-       "context"
-
-       "git.arvados.org/arvados.git/lib/ctrlctx"
        "git.arvados.org/arvados.git/sdk/go/arvados"
        "github.com/jmoiron/sqlx"
+
        // sqlx needs lib/pq to talk to PostgreSQL
        _ "github.com/lib/pq"
        "gopkg.in/check.v1"
@@ -21,14 +19,3 @@ func DB(c *check.C, cluster *arvados.Cluster) *sqlx.DB {
        c.Assert(err, check.IsNil)
        return db
 }
-
-// TransactionContext returns a context suitable for running a test
-// case in a new transaction, and a rollback func which the caller
-// should call after the test.
-func TransactionContext(c *check.C, db *sqlx.DB) (ctx context.Context, rollback func()) {
-       tx, err := db.Beginx()
-       c.Assert(err, check.IsNil)
-       return ctrlctx.NewWithTransaction(context.Background(), tx), func() {
-               c.Check(tx.Rollback(), check.IsNil)
-       }
-}