Ensure that Org setting modifying tests don't run in parallel

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Author: deiga

github/acc_helpers_test.go

@@ -659,3 +659,31 @@ func mustDisableForkingForOrganization(t *testing.T, orgName string) {
 		}
 	})
 }
+
+func mustRequireWebCommitSignoffForOrganization(t *testing.T, orgName string) {
+	t.Helper()
+
+	currentSettings, _, err := testAccConf.meta.v3client.Organizations.Get(t.Context(), orgName)
+	if err != nil {
+		t.Fatalf("failed to get current organization settings for %s: %v", orgName, err)
+	}
+
+	if currentSettings.GetWebCommitSignoffRequired() == true {
+		return
+	}
+
+	orgSettingsReq := &github.Organization{
+		WebCommitSignoffRequired: new(true),
+	}
+
+	_, _, err = testAccConf.meta.v3client.Organizations.Edit(t.Context(), orgName, orgSettingsReq)
+	if err != nil {
+		t.Fatalf("failed to update organization settings for %s: %v", orgName, err)
+	}
+
+	t.Cleanup(func() {
+		if _, _, err := testAccConf.meta.v3client.Organizations.Edit(context.WithoutCancel(t.Context()), orgName, &github.Organization{WebCommitSignoffRequired: new(false)}); err != nil {
+			t.Logf("failed to reset organization setting for %s: %v", orgName, err)
+		}
+	})
+}

github/resource_github_repository_test.go

@@ -1341,9 +1341,8 @@ resource "github_repository" "test" {
 	})
 
 	t.Run("check_web_commit_signoff_required_organization_enabled_but_not_set", func(t *testing.T) {
-		t.Parallel()
-
-		t.Skip("This test should be run manually after confirming that the test organization has 'Require contributors to sign off on web-based commits' enabled under Organizations -> Settings -> Repository -> Repository defaults.")
+		// This test can't be run in parallel because it modifies the organization settings, which could affect other tests.
+		mustRequireWebCommitSignoffForOrganization(t, testAccConf.owner)
 
 		randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
 		testRepoName := fmt.Sprintf("%scommit-signoff-%s", testResourcePrefix, randomID)
@@ -1374,8 +1373,7 @@ resource "github_repository" "test" {
 	})
 
 	t.Run("check_allow_forking_not_set", func(t *testing.T) {
-		t.Parallel()
-
+		// This test can't be run in parallel because it modifies the organization settings, which could affect other tests.
 		mustDisableForkingForOrganization(t, testAccConf.owner)
 
 		randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
@@ -1403,6 +1401,7 @@ resource "github_repository" "private" {
 		})
 	})
 
+	// TODO: Delete test when removing deprecated vulnerability_alerts attribute.
 	t.Run("check_vulnerability_alerts_not_set", func(t *testing.T) {
 		t.Parallel()