Skip to content

Commit c5e808e

Browse files
committed
Fixed user password hash invalid instead of nil as error.
1 parent 1a9fd29 commit c5e808e

File tree

1 file changed

+5
-25
lines changed

1 file changed

+5
-25
lines changed

store/store_test.go

+5-25
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,15 @@ func TestInit(t *testing.T) {
3939
if err != nil {
4040
t.Fatal(err)
4141
}
42-
43-
// cleanup
44-
err = os.Remove("data/gaia.db")
45-
if err != nil {
46-
t.Fatal(err)
47-
}
42+
defer os.Remove("data/gaia.db")
4843
}
4944

5045
func TestUserGet(t *testing.T) {
5146
err := store.Init()
5247
if err != nil {
5348
t.Fatal(err)
5449
}
50+
defer os.Remove("data/gaia.db")
5551

5652
u := &gaia.User{}
5753
u.Username = "testuser"
@@ -77,19 +73,14 @@ func TestUserGet(t *testing.T) {
7773
if user == nil {
7874
t.Fatalf("Expected user %v. Got nil.", u.Username)
7975
}
80-
81-
// cleanup
82-
err = os.Remove("data/gaia.db")
83-
if err != nil {
84-
t.Fatal(err)
85-
}
8676
}
8777

8878
func TestUserPut(t *testing.T) {
8979
err := store.Init()
9080
if err != nil {
9181
t.Fatal(err)
9282
}
83+
defer os.Remove("data/gaia.db")
9384

9485
u := &gaia.User{}
9586
u.Username = "testuser"
@@ -99,19 +90,14 @@ func TestUserPut(t *testing.T) {
9990
if err != nil {
10091
t.Fatal(err)
10192
}
102-
103-
// cleanup
104-
err = os.Remove("data/gaia.db")
105-
if err != nil {
106-
t.Fatal(err)
107-
}
10893
}
10994

11095
func TestUserAuth(t *testing.T) {
11196
err := store.Init()
11297
if err != nil {
11398
t.Fatal(err)
11499
}
100+
defer os.Remove("data/gaia.db")
115101

116102
u := &gaia.User{}
117103
u.Username = "testuser"
@@ -149,16 +135,10 @@ func TestUserAuth(t *testing.T) {
149135
u.Username = "testuser"
150136
u.Password = "wrongpassword"
151137
r, err = store.UserAuth(u, true)
152-
if err != nil {
138+
if err == nil {
153139
t.Fatal(err)
154140
}
155141
if r != nil {
156142
t.Fatalf("Expected nil object here. User shouldnt be valid")
157143
}
158-
159-
// cleanup
160-
err = os.Remove("data/gaia.db")
161-
if err != nil {
162-
t.Fatal(err)
163-
}
164144
}

0 commit comments

Comments
 (0)