From da3b5eed38745f9c16cf8d000cad89eeebc7fa53 Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Tue, 27 Feb 2024 11:22:35 -0800 Subject: [PATCH 1/2] Change test organization for daprrp tests Signed-off-by: vinayada1 <28875764+vinayada1@users.noreply.github.com> --- build/test.mk | 6 ++++-- .../daprrp/noncloud}/resources/common.go | 0 .../resources/dapr_component_name_conflict_test.go | 0 .../daprrp/noncloud}/resources/dapr_pubsub_test.go | 0 .../daprrp/noncloud}/resources/dapr_secretstore_test.go | 0 .../noncloud}/resources/dapr_serviceinvocation_test.go | 0 .../daprrp/noncloud}/resources/dapr_statestore_test.go | 0 .../testdata/daprrp-resources-component-name-conflict.bicep | 0 .../testdata/daprrp-resources-pubsub-broker-manual.bicep | 2 +- .../testdata/daprrp-resources-pubsub-broker-recipe.bicep | 0 .../testdata/daprrp-resources-secretstore-manual.bicep | 0 .../testdata/daprrp-resources-secretstore-recipe.bicep | 0 .../testdata/daprrp-resources-serviceinvocation.bicep | 0 .../testdata/daprrp-resources-statestore-manual.bicep | 2 +- .../testdata/daprrp-resources-statestore-recipe.bicep | 0 15 files changed, 6 insertions(+), 4 deletions(-) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/common.go (100%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/dapr_component_name_conflict_test.go (100%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/dapr_pubsub_test.go (100%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/dapr_secretstore_test.go (100%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/dapr_serviceinvocation_test.go (100%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/dapr_statestore_test.go (100%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/testdata/daprrp-resources-component-name-conflict.bicep (100%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/testdata/daprrp-resources-pubsub-broker-manual.bicep (92%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/testdata/daprrp-resources-pubsub-broker-recipe.bicep (100%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/testdata/daprrp-resources-secretstore-manual.bicep (100%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/testdata/daprrp-resources-secretstore-recipe.bicep (100%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/testdata/daprrp-resources-serviceinvocation.bicep (100%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/testdata/daprrp-resources-statestore-manual.bicep (92%) rename test/{functional/daprrp => functional-portable/daprrp/noncloud}/resources/testdata/daprrp-resources-statestore-recipe.bicep (100%) diff --git a/build/test.mk b/build/test.mk index dacbddca93..71481f1e3a 100644 --- a/build/test.mk +++ b/build/test.mk @@ -82,8 +82,10 @@ test-functional-cli: test-functional-cli-noncloud ## Runs all cli functional tes test-functional-cli-noncloud: ## Runs cli functional tests that do not require cloud resources CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/cli/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 10 $(GOTEST_OPTS) -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-daprrp: test-functional-daprrp-noncloud + +test-functional-daprrp-noncloud: ## Runs Dapr RP functional tests that do not require cloud resources + CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/daprrp/noncloud/... -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) diff --git a/test/functional/daprrp/resources/common.go b/test/functional-portable/daprrp/noncloud/resources/common.go similarity index 100% rename from test/functional/daprrp/resources/common.go rename to test/functional-portable/daprrp/noncloud/resources/common.go diff --git a/test/functional/daprrp/resources/dapr_component_name_conflict_test.go b/test/functional-portable/daprrp/noncloud/resources/dapr_component_name_conflict_test.go similarity index 100% rename from test/functional/daprrp/resources/dapr_component_name_conflict_test.go rename to test/functional-portable/daprrp/noncloud/resources/dapr_component_name_conflict_test.go diff --git a/test/functional/daprrp/resources/dapr_pubsub_test.go b/test/functional-portable/daprrp/noncloud/resources/dapr_pubsub_test.go similarity index 100% rename from test/functional/daprrp/resources/dapr_pubsub_test.go rename to test/functional-portable/daprrp/noncloud/resources/dapr_pubsub_test.go diff --git a/test/functional/daprrp/resources/dapr_secretstore_test.go b/test/functional-portable/daprrp/noncloud/resources/dapr_secretstore_test.go similarity index 100% rename from test/functional/daprrp/resources/dapr_secretstore_test.go rename to test/functional-portable/daprrp/noncloud/resources/dapr_secretstore_test.go diff --git a/test/functional/daprrp/resources/dapr_serviceinvocation_test.go b/test/functional-portable/daprrp/noncloud/resources/dapr_serviceinvocation_test.go similarity index 100% rename from test/functional/daprrp/resources/dapr_serviceinvocation_test.go rename to test/functional-portable/daprrp/noncloud/resources/dapr_serviceinvocation_test.go diff --git a/test/functional/daprrp/resources/dapr_statestore_test.go b/test/functional-portable/daprrp/noncloud/resources/dapr_statestore_test.go similarity index 100% rename from test/functional/daprrp/resources/dapr_statestore_test.go rename to test/functional-portable/daprrp/noncloud/resources/dapr_statestore_test.go diff --git a/test/functional/daprrp/resources/testdata/daprrp-resources-component-name-conflict.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-component-name-conflict.bicep similarity index 100% rename from test/functional/daprrp/resources/testdata/daprrp-resources-component-name-conflict.bicep rename to test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-component-name-conflict.bicep diff --git a/test/functional/daprrp/resources/testdata/daprrp-resources-pubsub-broker-manual.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-manual.bicep similarity index 92% rename from test/functional/daprrp/resources/testdata/daprrp-resources-pubsub-broker-manual.bicep rename to test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-manual.bicep index f2e3c1a2b1..4dd9371036 100644 --- a/test/functional/daprrp/resources/testdata/daprrp-resources-pubsub-broker-manual.bicep +++ b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-manual.bicep @@ -39,7 +39,7 @@ resource myapp 'Applications.Core/containers@2023-10-01-preview' = { } -module redis '../../../shared/resources/testdata/modules/redis-selfhost.bicep' = { +module redis '../../../../../functional/shared/resources/testdata/modules/redis-selfhost.bicep' = { name: 'dpsb-manual-redis-deployment' params: { name: 'dpsb-manual-redis' diff --git a/test/functional/daprrp/resources/testdata/daprrp-resources-pubsub-broker-recipe.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-recipe.bicep similarity index 100% rename from test/functional/daprrp/resources/testdata/daprrp-resources-pubsub-broker-recipe.bicep rename to test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-recipe.bicep diff --git a/test/functional/daprrp/resources/testdata/daprrp-resources-secretstore-manual.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-manual.bicep similarity index 100% rename from test/functional/daprrp/resources/testdata/daprrp-resources-secretstore-manual.bicep rename to test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-manual.bicep diff --git a/test/functional/daprrp/resources/testdata/daprrp-resources-secretstore-recipe.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-recipe.bicep similarity index 100% rename from test/functional/daprrp/resources/testdata/daprrp-resources-secretstore-recipe.bicep rename to test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-recipe.bicep diff --git a/test/functional/daprrp/resources/testdata/daprrp-resources-serviceinvocation.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-serviceinvocation.bicep similarity index 100% rename from test/functional/daprrp/resources/testdata/daprrp-resources-serviceinvocation.bicep rename to test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-serviceinvocation.bicep diff --git a/test/functional/daprrp/resources/testdata/daprrp-resources-statestore-manual.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-manual.bicep similarity index 92% rename from test/functional/daprrp/resources/testdata/daprrp-resources-statestore-manual.bicep rename to test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-manual.bicep index fcf87818ee..0d96d0a543 100644 --- a/test/functional/daprrp/resources/testdata/daprrp-resources-statestore-manual.bicep +++ b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-manual.bicep @@ -39,7 +39,7 @@ resource myapp 'Applications.Core/containers@2023-10-01-preview' = { } -module redis '../../../shared/resources/testdata/modules/redis-selfhost.bicep' = { +module redis '../../../../../functional/shared/resources/testdata/modules/redis-selfhost.bicep' = { name: 'dapr-sts-manual-redis-deployment' params: { name: 'dapr-sts-manual-redis' diff --git a/test/functional/daprrp/resources/testdata/daprrp-resources-statestore-recipe.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-recipe.bicep similarity index 100% rename from test/functional/daprrp/resources/testdata/daprrp-resources-statestore-recipe.bicep rename to test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-recipe.bicep From eef09567ae23329b646cf6418bf2ee6eb6a8584f Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Mon, 4 Mar 2024 11:01:21 -0800 Subject: [PATCH 2/2] fix comments Signed-off-by: vinayada1 <28875764+vinayada1@users.noreply.github.com> --- build/test.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/test.mk b/build/test.mk index 71481f1e3a..bb58a31e31 100644 --- a/build/test.mk +++ b/build/test.mk @@ -82,7 +82,7 @@ test-functional-cli: test-functional-cli-noncloud ## Runs all cli functional tes test-functional-cli-noncloud: ## Runs cli functional tests that do not require cloud resources CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/cli/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 10 $(GOTEST_OPTS) -test-functional-daprrp: test-functional-daprrp-noncloud +test-functional-daprrp: test-functional-daprrp-noncloud ## Runs all Dapr RP functional tests (both cloud and non-cloud) test-functional-daprrp-noncloud: ## Runs Dapr RP functional tests that do not require cloud resources CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/daprrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 3 $(GOTEST_OPTS)