Skip to content

Commit 30c6175

Browse files
committed
feat(tests): Allow undeleteable type tests to fail.
chore(deps): Bump deps Signed-off-by: spbsoluble <[email protected]>
1 parent f5039a5 commit 30c6175

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

cmd/storeTypes_test.go

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ func createAllStoreTypes(t *testing.T, storeTypes map[string]interface{}) {
221221
t.Log("GITHUB_REF: ", ghBranch)
222222
}
223223
t.Log("testArgs: ", testArgs)
224-
224+
allowFail := false
225225
// Attempt to get the AWS store type because it comes with the product
226226
testCmd.SetArgs(testArgs)
227227
output := captureOutput(
@@ -239,12 +239,19 @@ func createAllStoreTypes(t *testing.T, storeTypes map[string]interface{}) {
239239
return
240240
}
241241
t.Error("Emsg: ", eMsg)
242+
if !allowFail {
243+
assert.NoError(t, err)
244+
}
245+
}
246+
if !allowFail {
242247
assert.NoError(t, err)
243248
}
244-
assert.NoError(t, err)
245249
},
246250
)
247-
assert.NotNil(t, output, "No output returned from create all command")
251+
252+
if !allowFail {
253+
assert.NotNil(t, output, "No output returned from create all command")
254+
}
248255

249256
// iterate over the store types and verify that each has a name shortname and storetype
250257
for sType := range storeTypes {
@@ -261,20 +268,23 @@ func createAllStoreTypes(t *testing.T, storeTypes map[string]interface{}) {
261268

262269
// Attempt to create the store type
263270
shortName := storeType["ShortName"].(string)
271+
allowStoreTypeFail := false
264272
if checkIsUnDeleteable(shortName) {
265-
t.Skip("Not processing un-deletable store-type: ", shortName)
266-
return
273+
t.Logf("WARNING: Skipping check for un-deletable store-type: %s", shortName)
274+
allowStoreTypeFail = true
267275
}
268276

269-
assert.Contains(
270-
t,
271-
output,
272-
fmt.Sprintf("Certificate store type %s created with ID", shortName),
273-
"Expected output to contain store type created message",
274-
)
277+
if !allowStoreTypeFail {
278+
assert.Contains(
279+
t,
280+
output,
281+
fmt.Sprintf("Certificate store type %s created with ID", shortName),
282+
"Expected output to contain store type created message",
283+
)
284+
}
275285

276286
// Delete again after create
277-
deleteStoreTypeTest(t, shortName, true)
287+
deleteStoreTypeTest(t, shortName, allowStoreTypeFail)
278288
}
279289
},
280290
)

0 commit comments

Comments
 (0)