Update tests to exit early if there is a setup error

hashicorp · Oct 21, 2022 · e8b91ef · e8b91ef
1 parent 2213c1e
commit e8b91ef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/organization_integration_test.go b/organization_integration_test.go
@@ -568,6 +568,8 @@ func TestOrganizationsReadRunTasksEntitlement(t *testing.T) {
 }
 
 func TestOrganizationsAllowForceDeleteSetting(t *testing.T) {
+	skipIfNotCINode(t)
+
 	client := testClient(t)
 	ctx := context.Background()
 
@@ -579,12 +581,12 @@ func TestOrganizationsAllowForceDeleteSetting(t *testing.T) {
 		}
 
 		org, err := client.Organizations.Create(ctx, options)
-		assert.Nil(t, err)
+		require.NoError(t, err)
 
 		t.Cleanup(func() {
 			err := client.Organizations.Delete(ctx, org.Name)
 			if err != nil {
-				t.Logf("error deleting organization (%s): %s", org.Name, err)
+				t.Errorf("error deleting organization (%s): %s", org.Name, err)
 			}
 		})
 
@@ -593,11 +595,11 @@ func TestOrganizationsAllowForceDeleteSetting(t *testing.T) {
 		assert.True(t, org.AllowForceDeleteWorkspaces)
 
 		org, err = client.Organizations.Update(ctx, org.Name, OrganizationUpdateOptions{AllowForceDeleteWorkspaces: Bool(false)})
-		assert.Nil(t, err)
+		require.NoError(t, err)
 		assert.False(t, org.AllowForceDeleteWorkspaces)
 
 		org, err = client.Organizations.Read(ctx, org.Name)
-		assert.Nil(t, err)
+		require.NoError(t, err)
 		assert.False(t, org.AllowForceDeleteWorkspaces)
 	})
 }

diff --git a/workspace_integration_test.go b/workspace_integration_test.go
@@ -1212,6 +1212,8 @@ func TestWorkspacesDeleteByID(t *testing.T) {
 }
 
 func TestCanForceDeletePermission(t *testing.T) {
+	skipIfNotCINode(t)
+
 	client := testClient(t)
 	ctx := context.Background()
 
@@ -1230,6 +1232,8 @@ func TestCanForceDeletePermission(t *testing.T) {
 }
 
 func TestWorkspacesSafeDelete(t *testing.T) {
+	skipIfNotCINode(t)
+
 	client := testClient(t)
 	ctx := context.Background()
 
@@ -1283,6 +1287,8 @@ func TestWorkspacesSafeDelete(t *testing.T) {
 }
 
 func TestWorkspacesSafeDeleteByID(t *testing.T) {
+	skipIfNotCINode(t)
+
 	client := testClient(t)
 	ctx := context.Background()