goatherd_test: Check if userlocks entry exists before (un-)locked

goatherd_test.go

@@ -278,8 +278,8 @@ func handleConnT(t *testing.T) {
 		if answer != "" {
 			t.Error("answer:", answer)
 		}
-		if faildelay.userlocks["dummy user"] != nil {
-			t.Error("userlock created for dummy user")
+		if _, ok := faildelay.userlocks["dummy user"]; ok {
+			t.Error("userlock entry created for dummy user")
 		}
 	})
 
@@ -296,8 +296,10 @@ func handleConnT(t *testing.T) {
 		if answer != "FAIL" {
 			t.Error("answer:", answer)
 		}
-		if faildelay.userlocks[username] == nil {
-			t.Error("userlock not in map")
+		if ul, ok := faildelay.userlocks[username]; !ok {
+			t.Error("no entry in userlocks")
+		} else if ul != delay {
+			t.Error("entry in userlocks is not the returned lock")
 		}
 	})
 
@@ -311,7 +313,9 @@ func handleConnT(t *testing.T) {
 		if delay != nil {
 			t.Fail()
 		}
-		if *faildelay.userlocks[username] != unlocked {
+		if ul, ok := faildelay.userlocks[username]; !ok {
+			t.Error("no entry in userlocks")
+		} else if *ul != unlocked {
 			t.Error("userlock not unlocked")
 		}
 		if answer != "OK" {