Merge pull request #9146 from nadavMiz/single-test-doc

update single tests variable names and docs to reflect change to path

Author: nadavMiz

Makefile

@@ -73,10 +73,10 @@ ifeq ($(USE_HOSTNETWORK), true)
 endif
 
 # running blob mock on - all tests run OR on single test run of test_s3_ops.js
-NAMESPACE_BLOB_TEST?="test_s3_ops.js"
+NAMESPACE_BLOB_TEST?="integration_tests/api/s3/test_s3_ops.js"
 RUN_BLOB_MOCK=true
-ifdef testname
-	ifneq ("$(testname)", $(NAMESPACE_BLOB_TEST))
+ifdef testpath
+	ifneq ("$(testpath)", $(NAMESPACE_BLOB_TEST))
 		RUN_BLOB_MOCK=false
 	endif
 endif
@@ -280,7 +280,7 @@ run-single-test: tester
 	@$(call run_mongo)
 	@$(call run_blob_mock)
 	@echo "\033[1;34mRunning tests\033[0m"
-	$(CONTAINER_ENGINE) run $(CPUSET) --network noobaa-net --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --env "DB_TYPE=mongodb" --env "MONGODB_URL=mongodb://noobaa:noobaa@coretest-mongo-$(GIT_COMMIT)-$(NAME_POSTFIX)" --env "BLOB_HOST=blob-mock-$(GIT_COMMIT)-$(NAME_POSTFIX)" --env "NOOBAA_LOG_LEVEL=all" $(TESTER_TAG) ./src/test/framework/run_npm_test_on_test_container.sh -s $(testname)
+	$(CONTAINER_ENGINE) run $(CPUSET) --network noobaa-net --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --env "DB_TYPE=mongodb" --env "MONGODB_URL=mongodb://noobaa:noobaa@coretest-mongo-$(GIT_COMMIT)-$(NAME_POSTFIX)" --env "BLOB_HOST=blob-mock-$(GIT_COMMIT)-$(NAME_POSTFIX)" --env "NOOBAA_LOG_LEVEL=all" $(TESTER_TAG) ./src/test/framework/run_npm_test_on_test_container.sh -s $(testpath)
 	@$(call stop_noobaa)
 	@$(call stop_blob_mock)
 	@$(call stop_mongo)
@@ -301,7 +301,7 @@ run-single-test-postgres: tester
 	@$(call run_postgres)
 	@$(call run_blob_mock)
 	@echo "\033[1;34mRunning tests\033[0m"
-	$(CONTAINER_ENGINE) run $(CPUSET) --network noobaa-net --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --env "POSTGRES_HOST=coretest-postgres-$(GIT_COMMIT)-$(NAME_POSTFIX)" --env "POSTGRES_USER=noobaa" --env "DB_TYPE=postgres" --env "PG_ENABLE_QUERY_LOG=true" --env "PG_EXPLAIN_QUERIES=true" --env "BLOB_HOST=blob-mock-$(GIT_COMMIT)-$(NAME_POSTFIX)" $(TESTER_TAG)  ./src/test/framework/run_npm_test_on_test_container.sh -s $(testname)
+	$(CONTAINER_ENGINE) run $(CPUSET) --network noobaa-net --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --env "POSTGRES_HOST=coretest-postgres-$(GIT_COMMIT)-$(NAME_POSTFIX)" --env "POSTGRES_USER=noobaa" --env "DB_TYPE=postgres" --env "PG_ENABLE_QUERY_LOG=true" --env "PG_EXPLAIN_QUERIES=true" --env "BLOB_HOST=blob-mock-$(GIT_COMMIT)-$(NAME_POSTFIX)" $(TESTER_TAG)  ./src/test/framework/run_npm_test_on_test_container.sh -s $(testpath)
 	@$(call stop_noobaa)
 	@$(call stop_postgres)
 	@$(call stop_blob_mock)

docs/dev_guide/run_coretest_locally.md

@@ -10,7 +10,7 @@ Run simply with `sudo NC_CORETEST=true node ./node_modules/mocha/bin/mocha .src/
 More info can be found in [CI & Tests](#ci--tests).
 
 ### B) Containerized deployment (With DB)
-One way is to run it with: `make run-single-test testname=test_s3_bucket_policy.js`  
+One way is to run it with: `make run-single-test testpath=integration_tests/api/s3/test_s3_bucket_policy.js`
 but it would take time to build the needed images, therefore we will focus on another way.
 
 Another way is to create a postgres container and then run the test with the following steps:

src/test/framework/run_npm_test_on_test_container.sh

@@ -22,7 +22,7 @@ function usage() {
     echo -e "Usage:\n\t${0} [options]"
     echo -e "\t-c|--command     -   Replace the unit test command (default: ${command})"
     echo -e "\t-s|--single      -   Get the desired unit test to run and running it,"
-    echo -e "\t                     needs to get the file name for example test_object_io.js"
+    echo -e "\t                     needs to get the relative path from the tests directory for example integration_tests/internal/test_object_io.js"
     exit 0
 }