remove unused test scoping envs

src/cli/backup/exchange_e2e_test.go

@@ -54,8 +54,7 @@ func TestNoBackupExchangeE2ESuite(t *testing.T) {
 		t,
 		[][]string{tester.AWSStorageCredEnvs, tester.M365AcctCredEnvs},
 		tester.CorsoCITests,
-		tester.CorsoCLITests,
+	)})
-		tester.CorsoCLIBackupTests)})
 }
 
 func (suite *NoBackupExchangeE2ESuite) SetupSuite() {
@@ -134,8 +133,7 @@ func TestBackupExchangeE2ESuite(t *testing.T) {
 		t,
 		[][]string{tester.AWSStorageCredEnvs, tester.M365AcctCredEnvs},
 		tester.CorsoCITests,
-		tester.CorsoCLITests,
+	)})
-		tester.CorsoCLIBackupTests)})
 }
 
 func (suite *BackupExchangeE2ESuite) SetupSuite() {
@@ -224,8 +222,7 @@ func TestPreparedBackupExchangeE2ESuite(t *testing.T) {
 		t,
 		[][]string{tester.AWSStorageCredEnvs, tester.M365AcctCredEnvs},
 		tester.CorsoCITests,
-		tester.CorsoCLITests,
+	)})
-		tester.CorsoCLIBackupTests)})
 }
 
 func (suite *PreparedBackupExchangeE2ESuite) SetupSuite() {
@@ -462,8 +459,7 @@ func TestBackupDeleteExchangeE2ESuite(t *testing.T) {
 			t,
 			[][]string{tester.AWSStorageCredEnvs, tester.M365AcctCredEnvs},
 			tester.CorsoCITests,
-			tester.CorsoCLITests,
+		),
-			tester.CorsoCLIBackupTests),
 	})
 }
 

src/cli/backup/onedrive_e2e_test.go

@@ -45,8 +45,7 @@ func TestNoBackupOneDriveE2ESuite(t *testing.T) {
 			t,
 			[][]string{tester.AWSStorageCredEnvs, tester.M365AcctCredEnvs},
 			tester.CorsoCITests,
-			tester.CorsoCLITests,
+		),
-			tester.CorsoCLIBackupTests),
 	})
 }
 
@@ -133,8 +132,7 @@ func TestBackupDeleteOneDriveE2ESuite(t *testing.T) {
 			t,
 			[][]string{tester.AWSStorageCredEnvs, tester.M365AcctCredEnvs},
 			tester.CorsoCITests,
-			tester.CorsoCLITests,
+		),
-			tester.CorsoCLIBackupTests),
 	})
 }
 

src/cli/backup/sharepoint_e2e_test.go

@@ -44,8 +44,7 @@ func TestNoBackupSharePointE2ESuite(t *testing.T) {
 		t,
 		[][]string{tester.AWSStorageCredEnvs, tester.M365AcctCredEnvs},
 		tester.CorsoCITests,
-		tester.CorsoCLITests,
+	)})
-		tester.CorsoCLIBackupTests)})
 }
 
 func (suite *NoBackupSharePointE2ESuite) SetupSuite() {
@@ -125,8 +124,7 @@ func TestBackupDeleteSharePointE2ESuite(t *testing.T) {
 			t,
 			[][]string{tester.AWSStorageCredEnvs, tester.M365AcctCredEnvs},
 			tester.CorsoCITests,
-			tester.CorsoCLITests,
+		),
-			tester.CorsoCLIBackupTests),
 	})
 }
 

src/cli/config/config_test.go

@@ -190,7 +190,7 @@ func TestConfigIntegrationSuite(t *testing.T) {
 	suite.Run(t, &ConfigIntegrationSuite{Suite: tester.NewIntegrationSuite(
 		t,
 		[][]string{tester.AWSStorageCredEnvs, tester.M365AcctCredEnvs},
-		tester.CorsoCLIConfigTests)})
+	)})
 }
 
 func (suite *ConfigIntegrationSuite) TestGetStorageAndAccount() {

src/cli/repo/s3_e2e_test.go

@@ -24,8 +24,7 @@ func TestS3E2ESuite(t *testing.T) {
 		t,
 		[][]string{tester.AWSStorageCredEnvs, tester.M365AcctCredEnvs},
 		tester.CorsoCITests,
-		tester.CorsoCLITests,
+	)})
-		tester.CorsoCLIRepoTests)})
 }
 
 func (suite *S3E2ESuite) TestInitS3Cmd() {

src/cli/restore/exchange_e2e_test.go

@@ -47,8 +47,7 @@ func TestRestoreExchangeE2ESuite(t *testing.T) {
 			t,
 			[][]string{tester.AWSStorageCredEnvs, tester.M365AcctCredEnvs},
 			tester.CorsoCITests,
-			tester.CorsoCLITests,
+		),
-			tester.CorsoCLIRestoreTests),
 	})
 }
 

src/internal/connector/data_collections_test.go

@@ -35,8 +35,7 @@ func TestConnectorDataCollectionIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoConnectorDataCollectionTests),
 	})
 }
 
@@ -307,8 +306,7 @@ func TestConnectorCreateSharePointCollectionIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoConnectorCreateSharePointCollectionTests),
 	})
 }
 

src/internal/connector/exchange/api/api_test.go

@@ -26,8 +26,7 @@ func TestExchangeServiceSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorExchangeTests),
 	})
 }
 

src/internal/connector/exchange/container_resolver_test.go

@@ -519,9 +519,7 @@ func TestFolderCacheIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorExchangeTests,
-			tester.CorsoConnectorExchangeFolderCacheTests),
 	})
 }
 

src/internal/connector/exchange/data_collections_test.go

@@ -219,9 +219,7 @@ func TestDataCollectionsIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorExchangeTests,
-			tester.CorsoConnectorCreateExchangeCollectionTests),
 	})
 }
 

src/internal/connector/exchange/folder_resolver_test.go

@@ -24,8 +24,7 @@ func TestCacheResolverIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorExchangeTests),
 	})
 }
 

src/internal/connector/exchange/mail_folder_cache_test.go

@@ -36,8 +36,7 @@ func TestMailFolderCacheIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorExchangeTests),
 	})
 }
 

src/internal/connector/exchange/restore_test.go

@@ -33,9 +33,7 @@ func TestExchangeRestoreSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorExchangeTests,
-			tester.CorsoConnectorRestoreExchangeCollectionTests),
 	})
 }
 

src/internal/connector/graph/betasdk/beta_client_test.go

@@ -19,10 +19,7 @@ type BetaClientSuite struct {
 
 func TestBetaClientSuite(t *testing.T) {
 	suite.Run(t, &BetaClientSuite{
-		Suite: tester.NewIntegrationSuite(
+		Suite: tester.NewIntegrationSuite(t, [][]string{tester.M365AcctCredEnvs}),
-			t,
-			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests),
 	})
 }
 

src/internal/connector/graph_connector_onedrive_test.go

@@ -96,8 +96,7 @@ func TestGraphConnectorOneDriveIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorOneDriveTests),
 	})
 }
 

src/internal/connector/graph_connector_test.go

@@ -151,8 +151,7 @@ func TestGraphConnectorIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorExchangeTests),
 	})
 }
 

src/internal/connector/onedrive/drive_test.go

@@ -332,8 +332,7 @@ func TestOneDriveDriveSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorOneDriveTests),
 	})
 }
 

src/internal/connector/onedrive/item_test.go

@@ -40,8 +40,7 @@ func TestItemIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorOneDriveTests),
 	})
 }
 

src/internal/connector/sharepoint/api/pages_test.go

@@ -40,11 +40,7 @@ func (suite *SharePointPageSuite) SetupSuite() {
 
 func TestSharePointPageSuite(t *testing.T) {
 	suite.Run(t, &SharePointPageSuite{
-		Suite: tester.NewIntegrationSuite(
+		Suite: tester.NewIntegrationSuite(t, [][]string{tester.M365AcctCredEnvs}),
-			t,
-			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
-			tester.CorsoGraphConnectorSharePointTests),
 	})
 }
 

src/internal/connector/sharepoint/collection_test.go

@@ -46,8 +46,7 @@ func TestSharePointCollectionSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorSharePointTests),
 	})
 }
 

src/internal/connector/sharepoint/data_collections_test.go

@@ -169,8 +169,7 @@ func TestSharePointPagesSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorSharePointTests),
 	})
 }
 

src/internal/connector/sharepoint/list_test.go

@@ -31,8 +31,7 @@ func TestSharePointSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.M365AcctCredEnvs},
-			tester.CorsoGraphConnectorTests,
+		),
-			tester.CorsoGraphConnectorSharePointTests),
 	})
 }
 

src/internal/kopia/conn_test.go

@@ -63,7 +63,6 @@ func TestWrapperIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.AWSStorageCredEnvs},
-			tester.CorsoKopiaWrapperTests,
 		),
 	})
 }

src/internal/kopia/model_store_test.go

@@ -67,7 +67,6 @@ func TestModelStoreIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.AWSStorageCredEnvs},
-			tester.CorsoModelStoreTests,
 		),
 	})
 }
@@ -724,7 +723,6 @@ func TestModelStoreRegressionSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.AWSStorageCredEnvs},
-			tester.CorsoModelStoreTests,
 		),
 	})
 }

src/internal/kopia/wrapper_test.go

@@ -158,7 +158,6 @@ func TestKopiaIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.AWSStorageCredEnvs},
-			tester.CorsoKopiaWrapperTests,
 		),
 	})
 }
@@ -574,7 +573,6 @@ func TestKopiaSimpleRepoIntegrationSuite(t *testing.T) {
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tester.AWSStorageCredEnvs},
-			tester.CorsoKopiaWrapperTests,
 		),
 	})
 }

src/internal/operations/backup_integration_test.go

@@ -456,12 +456,7 @@ type BackupOpIntegrationSuite struct {
 }
 
 func TestBackupOpIntegrationSuite(t *testing.T) {
-	tester.RunOnAny(
+	tester.RunOnAny(t, tester.CorsoCITests)
-		t,
-		tester.CorsoCITests,
-		tester.CorsoOperationTests,
-		tester.CorsoOperationBackupTests)
-
 	suite.Run(t, new(BackupOpIntegrationSuite))
 }
 

src/internal/operations/restore_test.go

@@ -136,10 +136,7 @@ type RestoreOpIntegrationSuite struct {
 }
 
 func TestRestoreOpIntegrationSuite(t *testing.T) {
-	tester.RunOnAny(
+	tester.RunOnAny(t, tester.CorsoCITests)
-		t,
-		tester.CorsoCITests,
-		tester.CorsoOperationTests)
 
 	suite.Run(t, new(RestoreOpIntegrationSuite))
 }

src/internal/tester/suite.go

@@ -15,28 +15,6 @@ const (
 	CorsoCITests   = "CORSO_CI_TESTS"
 	CorsoE2ETests  = "CORSO_E2E_TESTS"
 	CorsoLoadTests = "CORSO_LOAD_TESTS"
-
-	CorsoCLIBackupTests                           = "CORSO_COMMAND_LINE_BACKUP_TESTS"
-	CorsoCLIConfigTests                           = "CORSO_COMMAND_LINE_CONFIG_TESTS"
-	CorsoCLIRepoTests                             = "CORSO_COMMAND_LINE_REPO_TESTS"
-	CorsoCLIRestoreTests                          = "CORSO_COMMAND_LINE_RESTORE_TESTS"
-	CorsoCLITests                                 = "CORSO_COMMAND_LINE_TESTS"
-	CorsoConnectorCreateCollectionTests           = "CORSO_CONNECTOR_CREATE_COLLECTION_TESTS"
-	CorsoConnectorCreateExchangeCollectionTests   = "CORSO_CONNECTOR_CREATE_EXCHANGE_COLLECTION_TESTS"
-	CorsoConnectorCreateSharePointCollectionTests = "CORSO_CONNECTOR_CREATE_SHAREPOINT_COLLECTION_TESTS"
-	CorsoConnectorDataCollectionTests             = "CORSO_CONNECTOR_DATA_COLLECTION_TESTS"
-	CorsoConnectorExchangeFolderCacheTests        = "CORSO_CONNECTOR_EXCHANGE_FOLDER_CACHE_TESTS"
-	CorsoConnectorRestoreExchangeCollectionTests  = "CORSO_CONNECTOR_RESTORE_EXCHANGE_COLLECTION_TESTS"
-	CorsoGraphConnectorTests                      = "CORSO_GRAPH_CONNECTOR_TESTS"
-	CorsoGraphConnectorExchangeTests              = "CORSO_GRAPH_CONNECTOR_EXCHANGE_TESTS"
-	CorsoGraphConnectorOneDriveTests              = "CORSO_GRAPH_CONNECTOR_ONE_DRIVE_TESTS"
-	CorsoGraphConnectorSharePointTests            = "CORSO_GRAPH_CONNECTOR_SHAREPOINT_TESTS"
-	CorsoKopiaWrapperTests                        = "CORSO_KOPIA_WRAPPER_TESTS"
-	CorsoModelStoreTests                          = "CORSO_MODEL_STORE_TESTS"
-	CorsoOneDriveTests                            = "CORSO_ONE_DRIVE_TESTS"
-	CorsoOperationTests                           = "CORSO_OPERATION_TESTS"
-	CorsoOperationBackupTests                     = "CORSO_OPERATION_BACKUP_TESTS"
-	CorsoRepositoryTests                          = "CORSO_REPOSITORY_TESTS"
 )
 
 type Suite interface {

src/pkg/repository/repository_test.go

@@ -96,11 +96,7 @@ type RepositoryIntegrationSuite struct {
 }
 
 func TestRepositoryIntegrationSuite(t *testing.T) {
-	tester.RunOnAny(
+	tester.RunOnAny(t, tester.CorsoCITests)
-		t,
-		tester.CorsoCITests,
-		tester.CorsoRepositoryTests)
-
 	suite.Run(t, new(RepositoryIntegrationSuite))
 }
 

src/pkg/repository/repository_unexported_test.go

@@ -16,11 +16,7 @@ type RepositoryModelSuite struct {
 }
 
 func TestRepositoryModelSuite(t *testing.T) {
-	tester.RunOnAny(
+	tester.RunOnAny(t, tester.CorsoCITests)
-		t,
-		tester.CorsoCITests,
-		tester.CorsoRepositoryTests)
-
 	suite.Run(t, new(RepositoryModelSuite))
 }