Browse Source

Fix: final fixes for both tests.

Signed-off-by: Gustavo Carvalho <gustavo.carvalho@container-solutions.com>
Signed-off-by: William Young <will.young@engineerbetter.com>
Marcin Kubica 4 years ago
parent
commit
71a36c471e
2 changed files with 11 additions and 3 deletions
  1. 7 1
      pkg/provider/gitlab/gitlab_test.go
  2. 4 2
      pkg/provider/oracle/oracle_test.go

+ 7 - 1
pkg/provider/gitlab/gitlab_test.go

@@ -292,14 +292,20 @@ func TestValidateStore(t *testing.T) {
 			store: makeSecretStore(project, withAccessToken("userName", "userKey", &namespace)),
 			err:   fmt.Errorf("namespace not allowed with namespaced SecretStore"),
 		},
+		{
+			store: makeSecretStore(project, withAccessToken("userName", "userKey", nil)),
+			err:   nil,
+		},
 	}
 	p := Gitlab{}
 	for _, tc := range testCases {
 		err := p.ValidateStore(tc.store)
-		if tc.err != nil && err.Error() != tc.err.Error() {
+		if tc.err != nil && err != nil && err.Error() != tc.err.Error() {
 			t.Errorf("test failed! want %v, got %v", tc.err, err)
 		} else if tc.err == nil && err != nil {
 			t.Errorf("want nil got err %v", err)
+		} else if tc.err != nil && err == nil {
+			t.Errorf("want err %v got nil", tc.err)
 		}
 	}
 }

+ 4 - 2
pkg/provider/oracle/oracle_test.go

@@ -278,7 +278,7 @@ func TestValidateStore(t *testing.T) {
 			err:   fmt.Errorf("fingerprint.name cannot be empty"),
 		},
 		{
-			store: makeSecretStore(vaultOCID, region, withSecretAuth(userOCID, tenant), withPrivateKey(secretName, secretKey, nil), withFingerprint(secretName, secretKey, &namespace)),
+			store: makeSecretStore(vaultOCID, region, withSecretAuth(userOCID, tenant), withPrivateKey(secretName, secretKey, nil), withFingerprint(secretName, secretKey, nil)),
 			err:   fmt.Errorf("namespace not allowed with namespaced SecretStore"),
 		},
 		{
@@ -293,10 +293,12 @@ func TestValidateStore(t *testing.T) {
 	p := VaultManagementService{}
 	for _, tc := range testCases {
 		err := p.ValidateStore(tc.store)
-		if tc.err != nil && err.Error() != tc.err.Error() {
+		if tc.err != nil && err != nil && err.Error() != tc.err.Error() {
 			t.Errorf("test failed! want %v, got %v", tc.err, err)
 		} else if tc.err == nil && err != nil {
 			t.Errorf("want nil got err %v", err)
+		} else if tc.err != nil && err == nil {
+			t.Errorf("want err %v got nil", tc.err)
 		}
 	}
 }