Change test organization for datastoresrp tests (radius-project#7224)

# Description - Separate cloud/non-cloud tests - Organize the daprrp tests as per radius-project/design-notes#35. There will be more PRs that will follow to re-org the other tests. ## Type of change  - This pull request adds or changes features of Radius and has an approved issue (radius-project#6588).  Fixes: Fixes part of radius-project#6588. This is a part of a multi-PR fix --------- Signed-off-by: vinayada1 <[email protected]>
vishwahiremat · Mar 5, 2024 · 389526f · 389526f
1 parent 231966a
commit 389526f
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 2 deletions.
diff --git a/build/test.mk b/build/test.mk
@@ -85,8 +85,13 @@ test-functional-cli-noncloud: ## Runs cli functional tests that do not require c
 test-functional-daprrp: ## Runs Dapr RP functional tests
 	CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional/daprrp/... -timeout ${TEST_TIMEOUT} -v -parallel 3 $(GOTEST_OPTS)
 
-test-functional-datastoresrp: ## Runs Datastores RP functional tests
-	CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional/datastoresrp/... -timeout ${TEST_TIMEOUT} -v -parallel 3 $(GOTEST_OPTS)
+test-functional-datastoresrp: test-functional-datastoresrp-noncloud test-functional-datastoresrp-cloud ## Runs all Datastores RP functional tests (non-cloud and cloud)
+
+test-functional-datastoresrp-noncloud: ## Runs Datastores RP functional tests that do not require cloud resources
+	CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/datastoresrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 3 $(GOTEST_OPTS)
+
+test-functional-datastoresrp-cloud: ## Runs Datastores RP functional tests that require cloud resources
+	CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/datastoresrp/cloud/... -timeout ${TEST_TIMEOUT} -v -parallel 3 $(GOTEST_OPTS)
 
 test-functional-samples: test-functional-samples-noncloud ## Runs all Samples functional tests
 

diff --git a/...tastoresrp/resources/microsoftsql_test.go → ...esrp/cloud/resources/microsoftsql_test.go b/...tastoresrp/resources/microsoftsql_test.go → ...esrp/cloud/resources/microsoftsql_test.go
@@ -75,5 +75,6 @@ func Test_MicrosoftSQL_Manual(t *testing.T) {
 		},
 	})
 
+	test.RequiredFeatures = []shared.RequiredFeature{shared.FeatureAzure}
 	test.Test(t)
 }
diff --git a/...atastoresrp-resources-microsoft-sql.bicep → ...atastoresrp-resources-microsoft-sql.bicep b/...atastoresrp-resources-microsoft-sql.bicep → ...atastoresrp-resources-microsoft-sql.bicep
diff --git a/...al/datastoresrp/resources/mongodb_test.go → ...oresrp/noncloud/resources/mongodb_test.go b/...al/datastoresrp/resources/mongodb_test.go → ...oresrp/noncloud/resources/mongodb_test.go
diff --git a/...onal/datastoresrp/resources/redis_test.go → ...storesrp/noncloud/resources/redis_test.go b/...onal/datastoresrp/resources/redis_test.go → ...storesrp/noncloud/resources/redis_test.go
diff --git a/...p/resources/simulated_environment_test.go → ...d/resources/simulated_environment_test.go b/...p/resources/simulated_environment_test.go → ...d/resources/simulated_environment_test.go
diff --git a/...tional/datastoresrp/resources/sql_test.go → ...tastoresrp/noncloud/resources/sql_test.go b/...tional/datastoresrp/resources/sql_test.go → ...tastoresrp/noncloud/resources/sql_test.go
diff --git a/...rp-resources-mongodb-recipe-context.bicep → ...rp-resources-mongodb-recipe-context.bicep b/...rp-resources-mongodb-recipe-context.bicep → ...rp-resources-mongodb-recipe-context.bicep
diff --git a/...tastoresrp-resources-mongodb-recipe.bicep → ...tastoresrp-resources-mongodb-recipe.bicep b/...tastoresrp-resources-mongodb-recipe.bicep → ...tastoresrp-resources-mongodb-recipe.bicep
diff --git a/...esrp-resources-redis-default-recipe.bicep → ...esrp-resources-redis-default-recipe.bicep b/...esrp-resources-redis-default-recipe.bicep → ...esrp-resources-redis-default-recipe.bicep
diff --git a/...datastoresrp-resources-redis-manual.bicep → ...datastoresrp-resources-redis-manual.bicep b/...datastoresrp-resources-redis-manual.bicep → ...datastoresrp-resources-redis-manual.bicep
diff --git a/...datastoresrp-resources-redis-recipe.bicep → ...datastoresrp-resources-redis-recipe.bicep b/...datastoresrp-resources-redis-recipe.bicep → ...datastoresrp-resources-redis-recipe.bicep
diff --git a/...resrp-resources-simulatedenv-recipe.bicep → ...resrp-resources-simulatedenv-recipe.bicep b/...resrp-resources-simulatedenv-recipe.bicep → ...resrp-resources-simulatedenv-recipe.bicep
diff --git a/...datastoresrp-resources-sqldb-manual.bicep → ...datastoresrp-resources-sqldb-manual.bicep b/...datastoresrp-resources-sqldb-manual.bicep → ...datastoresrp-resources-sqldb-manual.bicep
diff --git a/...datastoresrp-resources-sqldb-recipe.bicep → ...datastoresrp-resources-sqldb-recipe.bicep b/...datastoresrp-resources-sqldb-recipe.bicep → ...datastoresrp-resources-sqldb-recipe.bicep
diff --git a/...data/datastoresrp-rs-mongodb-manual.bicep → ...data/datastoresrp-rs-mongodb-manual.bicep b/...data/datastoresrp-rs-mongodb-manual.bicep → ...data/datastoresrp-rs-mongodb-manual.bicep
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,5 +75,6 @@ func Test_MicrosoftSQL_Manual(t *testing.T) { @@
     		},
     	})
+    	test.RequiredFeatures = []shared.RequiredFeature{shared.FeatureAzure}
     	test.Test(t)
     }