@@ -9,17 +9,17 @@ package main
9
9
// NOTE go:build debug (above) =====================================
10
10
11
11
import (
12
- "github.com/NVIDIA/aistore/api/env"
13
- "github.com/NVIDIA/aistore/cmn/kvdb"
14
12
"os"
15
13
"testing"
16
14
"time"
17
15
18
16
"github.com/NVIDIA/aistore/api/apc"
19
17
"github.com/NVIDIA/aistore/api/authn"
18
+ "github.com/NVIDIA/aistore/api/env"
20
19
"github.com/NVIDIA/aistore/cmd/authn/tok"
21
20
"github.com/NVIDIA/aistore/cmn"
22
21
"github.com/NVIDIA/aistore/cmn/cos"
22
+ "github.com/NVIDIA/aistore/cmn/kvdb"
23
23
"github.com/NVIDIA/aistore/core/mock"
24
24
"github.com/NVIDIA/aistore/tools/tassert"
25
25
)
@@ -139,7 +139,7 @@ func testUserDelete(mgr *mgr, t *testing.T) {
139
139
}
140
140
}
141
141
142
- func createManagerWithAdmin (driver kvdb.Driver ) (m * mgr , code int , err error ) {
142
+ func createManagerWithAdmin (driver kvdb.Driver ) (* mgr , error ) {
143
143
oldPass , wasSet := os .LookupEnv (env .AisAuthAdminPassword )
144
144
os .Setenv (env .AisAuthAdminPassword , "admin-pass-for-test" )
145
145
// Reset after test
@@ -150,13 +150,14 @@ func createManagerWithAdmin(driver kvdb.Driver) (m *mgr, code int, err error) {
150
150
os .Unsetenv (env .AisAuthAdminPassword )
151
151
}
152
152
}()
153
- return newMgr (driver )
153
+ m , _ , err := newMgr (driver )
154
+ return m , err
154
155
}
155
156
156
157
func TestManager (t * testing.T ) {
157
158
driver := mock .NewDBDriver ()
158
159
// NOTE: new manager initializes users DB and adds a default user as a Guest
159
- mgr , _ , err := createManagerWithAdmin (driver )
160
+ mgr , err := createManagerWithAdmin (driver )
160
161
tassert .CheckError (t , err )
161
162
createUsers (mgr , t )
162
163
testInvalidUser (mgr , t )
@@ -184,7 +185,7 @@ func TestToken(t *testing.T) {
184
185
)
185
186
186
187
driver := mock .NewDBDriver ()
187
- mgr , _ , err := createManagerWithAdmin (driver )
188
+ mgr , err := createManagerWithAdmin (driver )
188
189
tassert .CheckFatal (t , err )
189
190
createUsers (mgr , t )
190
191
defer deleteUsers (mgr , false , t )
0 commit comments