Change test organization for datastoresrp tests

Signed-off-by: vinayada1 <28875764+vinayada1@users.noreply.github.com>
radius-project · Mar 1, 2024 · 2d4c343 · 2d4c343
1 parent e3c8e51
commit 2d4c343
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 2 deletions.
diff --git a/build/test.mk b/build/test.mk
@@ -75,8 +75,13 @@ test-functional-msgrp: ## Runs Messaging RP functional tests
 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 Datastores RP functional tests
+
+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: ## Runs Samples functional tests
 	CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional/samples/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)

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
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