Skip to content

Commit dcdacc4

Browse files
nadavMiznadavMiz
committed
chnage tests directory structure
Signed-off-by: nadav mizrahi <nadav.mizrahi16@gmail.com>
1 parent 95034f6 commit dcdacc4

File tree

466 files changed

+5486
-827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

466 files changed

+5486
-827
lines changed

‎.github/workflows/nightly-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ jobs:
1515
-e NEWAWSPROJSECRET=${{ secrets.NEWAWSPROJSECRET }} \
1616
-e NEWAZUREPROJKEY=${{ secrets.NEWAZUREPROJKEY }} \
1717
-e NEWAZUREPROJSECRET=${{ secrets.NEWAZUREPROJSECRET }} \
18-
--name test1 noobaa-tester ./src/test/unit_tests/run_npm_test_on_test_container.sh -s test_s3_ops.js
18+
--name test1 noobaa-tester ./src/test/framework/run_npm_test_on_test_container.sh -s test_s3_ops.js

‎Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ root-perm-test: tester
268268
@$(call create_docker_network)
269269
@$(call run_mongo)
270270
@echo "\033[1;34mRunning root permission tests\033[0m"
271-
$(CONTAINER_ENGINE) run $(CPUSET) --network noobaa-net --privileged --user root --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)" $(TESTER_TAG) ./src/test/unit_tests/run_npm_test_on_test_container.sh -s sudo_index.js
271+
$(CONTAINER_ENGINE) run $(CPUSET) --network noobaa-net --privileged --user root --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)" $(TESTER_TAG) ./src/test/framework/run_npm_test_on_test_container.sh -s utils/index/sudo_index.js
272272
@$(call stop_noobaa)
273273
@$(call stop_mongo)
274274
@$(call remove_docker_network)
@@ -280,7 +280,7 @@ run-single-test: tester
280280
@$(call run_mongo)
281281
@$(call run_blob_mock)
282282
@echo "\033[1;34mRunning tests\033[0m"
283-
$(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/unit_tests/run_npm_test_on_test_container.sh -s $(testname)
283+
$(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)
284284
@$(call stop_noobaa)
285285
@$(call stop_blob_mock)
286286
@$(call stop_mongo)
@@ -290,7 +290,7 @@ run-single-test: tester
290290
run-nc-tests: tester
291291
@$(call create_docker_network)
292292
@echo "\033[1;34mRunning nc tests\033[0m"
293-
$(CONTAINER_ENGINE) run $(CPUSET) --network noobaa-net --privileged --user root --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) --env "NC_CORETEST=true" $(TESTER_TAG) ./src/test/unit_tests/run_npm_test_on_test_container.sh -s nc_index.js
293+
$(CONTAINER_ENGINE) run $(CPUSET) --network noobaa-net --privileged --user root --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) --env "NC_CORETEST=true" $(TESTER_TAG) ./src/test/framework/run_npm_test_on_test_container.sh -s utils/index/nc_index.js
294294
@$(call stop_noobaa)
295295
@$(call remove_docker_network)
296296
.PHONY: run-nc-tests
@@ -301,7 +301,7 @@ run-single-test-postgres: tester
301301
@$(call run_postgres)
302302
@$(call run_blob_mock)
303303
@echo "\033[1;34mRunning tests\033[0m"
304-
$(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/unit_tests/run_npm_test_on_test_container.sh -s $(testname)
304+
$(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)
305305
@$(call stop_noobaa)
306306
@$(call stop_postgres)
307307
@$(call stop_blob_mock)
@@ -346,7 +346,7 @@ test-cephs3: tester
346346
@$(call create_docker_network)
347347
@$(call run_postgres)
348348
@echo "\033[1;34mRunning tests\033[0m"
349-
$(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 "POSTGRES_DBNAME=coretest" -v $(PWD)/logs:/logs $(TESTER_TAG) "./src/test/system_tests/ceph_s3_tests/run_ceph_test_on_test_container.sh"
349+
$(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 "POSTGRES_DBNAME=coretest" -v $(PWD)/logs:/logs $(TESTER_TAG) "./src/test/external_tests/ceph_s3_tests/run_ceph_test_on_test_container.sh"
350350
@$(call stop_noobaa)
351351
@$(call stop_postgres)
352352
@$(call remove_docker_network)
@@ -357,23 +357,23 @@ test-warp: tester
357357
@$(call create_docker_network)
358358
@$(call run_postgres)
359359
@echo "\033[1;34mRunning warp tests\033[0m"
360-
$(CONTAINER_ENGINE) run $(CPUSET) --privileged --user root --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 "POSTGRES_DBNAME=coretest" -v $(PWD)/logs:/logs $(TESTER_TAG) "./src/test/system_tests/warp/run_warp_on_test_container.sh"
360+
$(CONTAINER_ENGINE) run $(CPUSET) --privileged --user root --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 "POSTGRES_DBNAME=coretest" -v $(PWD)/logs:/logs $(TESTER_TAG) "./src/test/external_tests/warp/run_warp_on_test_container.sh"
361361
@$(call stop_noobaa)
362362
@$(call stop_postgres)
363363
@$(call remove_docker_network)
364364
.PHONY: test-warp
365365

366366
test-nc-warp: tester
367367
@echo "\033[1;34mRunning warp tests on NC environment\033[0m"
368-
$(CONTAINER_ENGINE) run $(CPUSET) --privileged --user root --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" -v $(PWD)/logs:/logs $(TESTER_TAG) "./src/test/system_tests/warp/run_nc_warp_on_test_container.sh"
368+
$(CONTAINER_ENGINE) run $(CPUSET) --privileged --user root --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" -v $(PWD)/logs:/logs $(TESTER_TAG) "./src/test/external_tests/warp/run_nc_warp_on_test_container.sh"
369369
.PHONY: test-nc-warp
370370

371371
test-mint: tester
372372
@echo "\033[1;34mRunning mint tests with Postgres.\033[0m"
373373
@$(call create_docker_network)
374374
@$(call run_postgres)
375375
@echo "\033[1;34mRunning mint tests\033[0m"
376-
$(CONTAINER_ENGINE) run $(CPUSET) --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) -dit --network noobaa-net --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --env "POSTGRES_HOST=coretest-postgres-$(GIT_COMMIT)-$(NAME_POSTFIX)" --env "POSTGRES_USER=noobaa" --env "DB_TYPE=postgres" --env "POSTGRES_DBNAME=coretest" -v $(PWD)/logs/mint-test-logs/:/logs $(TESTER_TAG) bash -c "./src/test/system_tests/mint/run_mint_on_test_container.sh & tail -f /dev/null"
376+
$(CONTAINER_ENGINE) run $(CPUSET) --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) -dit --network noobaa-net --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --env "POSTGRES_HOST=coretest-postgres-$(GIT_COMMIT)-$(NAME_POSTFIX)" --env "POSTGRES_USER=noobaa" --env "DB_TYPE=postgres" --env "POSTGRES_DBNAME=coretest" -v $(PWD)/logs/mint-test-logs/:/logs $(TESTER_TAG) bash -c "./src/test/external_tests/mint/run_mint_on_test_container.sh & tail -f /dev/null"
377377
sleep 180
378378
$(CONTAINER_ENGINE) run --name mint-$(GIT_COMMIT)-$(NAME_POSTFIX) --network noobaa-net -v $(PWD)/logs/mint-test-logs/:/mint/log --env SERVER_ENDPOINT=noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX):$(MINT_NOOBAA_HTTP_ENDPOINT_PORT) --env ACCESS_KEY=$(MINT_MOCK_ACCESS_KEY) --env SECRET_KEY=$(MINT_MOCK_SECRET_KEY) --env ENABLE_HTTPS=0 minio/mint minio-go s3cmd
379379
@echo "\033[1;34mPrinting noobaa configuration and logs\033[0m"
@@ -391,7 +391,7 @@ test-mint: tester
391391
test-nc-mint: tester
392392
@echo "\033[1;34mRunning mint tests on NC environment\033[0m"
393393
@$(call create_docker_network)
394-
$(CONTAINER_ENGINE) run $(CPUSET) --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) -dit --privileged --user root --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --network noobaa-net -v $(PWD)/logs/mint-nc-test-logs/:/logs $(TESTER_TAG) bash -c "./src/test/system_tests/mint/run_nc_mint_on_test_container.sh; tail -f /dev/null"
394+
$(CONTAINER_ENGINE) run $(CPUSET) --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) -dit --privileged --user root --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --network noobaa-net -v $(PWD)/logs/mint-nc-test-logs/:/logs $(TESTER_TAG) bash -c "./src/test/external_tests/mint/run_nc_mint_on_test_container.sh; tail -f /dev/null"
395395
sleep 15
396396
$(CONTAINER_ENGINE) run --name mint-$(GIT_COMMIT)-$(NAME_POSTFIX) --network noobaa-net -v $(PWD)/logs/mint-nc-test-logs/:/mint/log --env RUN_ON_FAIL=0 --env SERVER_ENDPOINT=noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX):$(MINT_NOOBAA_HTTP_ENDPOINT_PORT) --env ACCESS_KEY=$(MINT_MOCK_ACCESS_KEY) --env SECRET_KEY=$(MINT_MOCK_SECRET_KEY) --env ENABLE_HTTPS=0 minio/mint minio-go s3cmd
397397
@echo "\033[1;34mPrinting noobaa configuration and logs\033[0m"
@@ -406,7 +406,7 @@ test-nc-mint: tester
406406

407407
test-nsfs-cephs3: tester
408408
@echo "\033[1;34mRunning Ceph S3 tests on NSFS Standalone platform\033[0m"
409-
$(CONTAINER_ENGINE) run $(CPUSET) --privileged --user root --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" -v $(PWD)/logs:/logs $(TESTER_TAG) "./src/test/system_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh"
409+
$(CONTAINER_ENGINE) run $(CPUSET) --privileged --user root --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" -v $(PWD)/logs:/logs $(TESTER_TAG) "./src/test/external_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh"
410410
.PHONY: test-nsfs-cephs3
411411

412412
test-sanity: tester
@@ -441,7 +441,7 @@ test-aws-sdk-clients: build-aws-client
441441
@$(call create_docker_network)
442442
@$(call run_postgres)
443443
@echo "\033[1;34mRunning aws sdk clients tests\033[0m"
444-
$(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 "POSTGRES_DBNAME=coretest" --env "NOOBAA_LOG_LEVEL=all" -v $(PWD)/logs:/logs noobaa-aws-client ./src/test/unit_tests/run_npm_test_on_test_container.sh -c ./node_modules/mocha/bin/mocha.js src/test/unit_tests/different_clients/test_go_sdkv2_script.js
444+
$(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 "POSTGRES_DBNAME=coretest" --env "NOOBAA_LOG_LEVEL=all" -v $(PWD)/logs:/logs noobaa-aws-client ./src/test/unit_tests/run_npm_test_on_test_container.sh -c ./node_modules/mocha/bin/mocha.js src/test/external_tests/test_go_sdkv2_script.js
445445
@$(call stop_noobaa)
446446
@$(call stop_postgres)
447447
@$(call remove_docker_network)

‎docs/NooBaaNonContainerized/CI&Tests.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ Run `NC mocha tests` with root permissions -
7676
* Run `NC mocha` tests **locally** -
7777
**Warning:** Running tests locally will do changes to your file system.
7878
* Run **all** NC mocha tests locally -
79-
Command: `sudo NC_CORETEST=true node node_modules/mocha/bin/mocha src/test/unit_tests/nc_index.js`.
79+
Command: `sudo NC_CORETEST=true node node_modules/mocha/bin/mocha src/test/utils/index/nc_index.js`.
8080

8181
* Run **a single** mocha test locally -
82-
Command: `sudo NC_CORETEST=true node node_modules/mocha/bin/mocha src/test/unit_tests/{test_name}.js`.
82+
Command: `sudo NC_CORETEST=true node node_modules/mocha/bin/mocha src/test/{test_type}/{test_name}.js`.
8383

8484
* Run `NC jest tests` -
8585
* Command: `sudo jest --testRegex=jest_tests/test_nc`.
@@ -162,10 +162,10 @@ Run `NSFS tests` with root permissions -
162162
* Run `NSFS mocha` tests **locally** -
163163
**Warning:** Running tests locally will do changes to your file system.
164164
* Run **all** NSFS mocha tests locally -
165-
Command: `sudo node node_modules/mocha/bin/mocha src/test/unit_tests/sudo_index.js`.
165+
Command: `sudo node node_modules/mocha/bin/mocha src/test/utils/index/sudo_index.js`.
166166

167167
* Run **a single** mocha test locally -
168-
Command: `sudo node node_modules/mocha/bin/mocha src/test/unit_tests/{test_name}.js`.
168+
Command: `sudo node node_modules/mocha/bin/mocha src/test/{test_type}/{test_name}.js`.
169169

170170

171171
#### NSFS Tests Files List

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"test": "npm run lint && npm run mocha",
2525
"ts": "tsc",
2626
"lint": "eslint src --quiet",
27-
"mocha": "node --allow-natives-syntax ./node_modules/.bin/_mocha src/test/unit_tests/index.js",
27+
"mocha": "node --allow-natives-syntax ./node_modules/.bin/_mocha src/test/utils/index/index.js",
2828
"jest": "sudo npx jest",
2929
"----": "-----------------------------------------------------------------",
3030
"start": "node --unhandled-rejections=warn src/cmd",

‎src/deploy/NVA_build/Tests.Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ WORKDIR /root/node_modules/noobaa-core/
3030
# Size: ~ 83.9 MB
3131
#
3232
##############################################################
33-
RUN ./src/test/system_tests/ceph_s3_tests/test_ceph_s3_deploy.sh $(pwd)
33+
RUN ./src/test/external_tests/ceph_s3_tests/test_ceph_s3_deploy.sh $(pwd)
3434
# add group permissions to s3-tests directory (tox needs it in order to run)
35-
RUN cd ./src/test/system_tests/ceph_s3_tests/ && \
35+
RUN cd ./src/test/external_tests/ceph_s3_tests/ && \
3636
chgrp -R 0 s3-tests && \
3737
chmod -R g=u s3-tests
3838

@@ -51,10 +51,10 @@ RUN npm install
5151
#
5252
##############################################################
5353
COPY ./src/deploy/NVA_build/standalone_deploy.sh ./src/deploy/NVA_build/standalone_deploy.sh
54-
COPY ./src/test/system_tests/ceph_s3_tests/run_ceph_test_on_test_container.sh ./src/test/system_tests/ceph_s3_tests/run_ceph_test_on_test_container.sh
54+
COPY ./src/test/external_tests/ceph_s3_tests/run_ceph_test_on_test_container.sh ./src/test/external_tests/ceph_s3_tests/run_ceph_test_on_test_container.sh
5555
COPY ./src/deploy/NVA_build/standalone_deploy_nsfs.sh ./src/deploy/NVA_build/standalone_deploy_nsfs.sh
56-
COPY ./src/test/system_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh ./src/test/system_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh
57-
RUN chmod +x ./src/test/system_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh
56+
COPY ./src/test/external_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh ./src/test/external_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh
57+
RUN chmod +x ./src/test/external_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh
5858
COPY ./src/test/system_tests/run_sanity_test_on_test_container.sh ./src/test/system_tests/run_sanity_test_on_test_container.sh
5959

6060
COPY .eslintrc.js /root/node_modules/noobaa-core
@@ -72,4 +72,4 @@ RUN mkdir -p /.npm && \
7272
chmod -R g=u /.npm
7373

7474
USER 10001:0
75-
CMD ["./src/test/unit_tests/run_npm_test_on_test_container.sh"]
75+
CMD ["./src/test/framework/run_npm_test_on_test_container.sh"]

‎src/test/unit_tests/different_clients/go_aws_sdkv2_client.go renamed to ‎src/test/different_clients/go_aws_sdkv2_client.go

File renamed without changes.

‎src/test/unit_tests/different_clients/run_go_sdkv2_client_script.js renamed to ‎src/test/different_clients/run_go_sdkv2_client_script.js

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh renamed to ‎src/test/external_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ mkdir -p ${CEPH_TEST_LOGS_DIR}
5454
# ====================================================================================
5555

5656
# Run the tests
57-
./src/test/system_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_and_run_s3_tests.sh
57+
./src/test/external_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_and_run_s3_tests.sh

‎src/test/system_tests/ceph_s3_tests/run_ceph_test_on_test_container.sh renamed to ‎src/test/external_tests/ceph_s3_tests/run_ceph_test_on_test_container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ mkdir -p ${CEPH_TEST_LOGS_DIR}
5151
# ====================================================================================
5252

5353
# Run the tests
54-
./src/test/system_tests/ceph_s3_tests/test_ceph_s3_config_and_run_s3_tests.sh
54+
./src/test/external_tests/ceph_s3_tests/test_ceph_s3_config_and_run_s3_tests.sh
5555

5656
# ====================================================================================

‎src/test/system_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_black_list.txt renamed to ‎src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_black_list.txt

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_pending_list.txt renamed to ‎src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_pending_list.txt

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt renamed to ‎src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt renamed to ‎src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_and_run_s3_tests.sh renamed to ‎src/test/external_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_and_run_s3_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#!/bin/bash
44
set -x
55

6-
CEPH_S3_DIRECTORY="src/test/system_tests/ceph_s3_tests"
6+
CEPH_S3_DIRECTORY="src/test/external_tests/ceph_s3_tests"
77
CEPH_S3_TESTS_CONFIG="${CEPH_S3_DIRECTORY}/test_ceph_nsfs_s3_config_setup.js"
88
CEPH_S3_RUN_TESTS="${CEPH_S3_DIRECTORY}/test_ceph_s3.js"
99
S3_CEPH_TEST_BLACKLIST="${CEPH_S3_DIRECTORY}/s3-tests-lists/nsfs_s3_tests_black_list.txt"

‎src/test/system_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_setup.js renamed to ‎src/test/external_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_setup.js

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/test_ceph_s3.js renamed to ‎src/test/external_tests/ceph_s3_tests/test_ceph_s3.js

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/test_ceph_s3_config.conf renamed to ‎src/test/external_tests/ceph_s3_tests/test_ceph_s3_config.conf

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/test_ceph_s3_config_and_run_s3_tests.sh renamed to ‎src/test/external_tests/ceph_s3_tests/test_ceph_s3_config_and_run_s3_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#!/bin/bash
66
set -x
77

8-
CEPH_S3_DIRECTORY="src/test/system_tests/ceph_s3_tests"
8+
CEPH_S3_DIRECTORY="src/test/external_tests/ceph_s3_tests"
99
CEPH_S3_TESTS_CONFIG="${CEPH_S3_DIRECTORY}/test_ceph_s3_config_setup.js"
1010
CEPH_S3_RUN_TESTS="${CEPH_S3_DIRECTORY}/test_ceph_s3.js"
1111
S3_CEPH_TEST_BLACKLIST="${CEPH_S3_DIRECTORY}/s3-tests-lists/s3_tests_black_list.txt"

‎src/test/system_tests/ceph_s3_tests/test_ceph_s3_config_setup.js renamed to ‎src/test/external_tests/ceph_s3_tests/test_ceph_s3_config_setup.js

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/test_ceph_s3_constants.js renamed to ‎src/test/external_tests/ceph_s3_tests/test_ceph_s3_constants.js

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/test_ceph_s3_deploy.sh renamed to ‎src/test/external_tests/ceph_s3_tests/test_ceph_s3_deploy.sh

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/test_ceph_s3_deployment.yml renamed to ‎src/test/external_tests/ceph_s3_tests/test_ceph_s3_deployment.yml

File renamed without changes.

‎src/test/system_tests/ceph_s3_tests/test_ceph_s3_job.yml renamed to ‎src/test/external_tests/ceph_s3_tests/test_ceph_s3_job.yml

File renamed without changes.

‎src/test/system_tests/mint/configure_mint.js renamed to ‎src/test/external_tests/mint/configure_mint.js

File renamed without changes.

‎src/test/system_tests/mint/mint_constants.js renamed to ‎src/test/external_tests/mint/mint_constants.js

File renamed without changes.

‎src/test/system_tests/mint/run_mint_on_test_container.sh renamed to ‎src/test/external_tests/mint/run_mint_on_test_container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ mkdir -p ${CEPH_TEST_LOGS_DIR}
5050
cd /root/node_modules/noobaa-core/
5151

5252
# Configure the mint test
53-
node ./src/test/system_tests/mint/configure_mint.js
53+
node ./src/test/external_tests/mint/configure_mint.js

‎src/test/system_tests/mint/run_nc_mint_on_test_container.sh renamed to ‎src/test/external_tests/mint/run_nc_mint_on_test_container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ chmod 777 ${CEPH_TEST_LOGS_DIR}
5454
cd /root/node_modules/noobaa-core/
5555

5656
# Configure the mint test
57-
node ./src/test/system_tests/mint/configure_mint.js
57+
node ./src/test/external_tests/mint/configure_mint.js

‎src/test/unit_tests/different_clients/test_go_sdkv2_script.js renamed to ‎src/test/external_tests/test_go_sdkv2_script.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
process.env.DISABLE_INIT_RANDOM_SEED = "true";
66

77
// setup coretest first to prepare the env
8-
const coretest = require('../coretest');
8+
const coretest = require('../utils/coretest/coretest');
99
coretest.setup({ pools_to_create: [coretest.POOL_LIST[1]] });
1010
const { rpc_client, EMAIL } = coretest;
1111

1212
const mocha = require('mocha');
1313
const assert = require('assert');
14-
const config = require('../../../../config');
15-
const { run_go_sdk_v2_client_script } = require('./run_go_sdkv2_client_script');
14+
const config = require('../../../config');
15+
const { run_go_sdk_v2_client_script } = require('../different_clients/run_go_sdkv2_client_script');
1616

1717
mocha.describe('Go AWS SDK V2 Client script execution', function() {
1818

‎src/test/system_tests/warp/configure_warp.js renamed to ‎src/test/external_tests/warp/configure_warp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const dbg = require('../../../util/debug_module')(__filename);
55
dbg.set_process_name('test_warp_s3');
66

77
const { WARP_TEST } = require('./warp_constants.js');
8-
const { is_containerized_deployment, create_system_test_account, create_system_test_bucket } = require('../external_tests_utils.js');
8+
const { is_containerized_deployment, create_system_test_account, create_system_test_bucket } = require('../../system_tests/external_tests_utils.js');
99

1010
async function main() {
1111
try {

‎src/test/system_tests/warp/run_nc_warp_on_test_container.sh renamed to ‎src/test/external_tests/warp/run_nc_warp_on_test_container.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ warp --version
6565
cd /root/node_modules/noobaa-core/
6666

6767
# Configure the warp test
68-
node ./src/test/system_tests/warp/configure_warp.js
68+
node ./src/test/external_tests/warp/configure_warp.js
6969

7070
# ====================================================================================
7171

7272
# Run the warp tests
73-
node ./src/test/system_tests/warp/run_warp.js
73+
node ./src/test/external_tests/warp/run_warp.js
7474

7575
# ====================================================================================

‎src/test/system_tests/warp/run_warp.js renamed to ‎src/test/external_tests/warp/run_warp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ delete argv._;
88

99
const config = require('../../../../config');
1010
const os_utils = require('../../../util/os_utils');
11-
const { get_account_access_keys } = require('../external_tests_utils');
11+
const { get_account_access_keys } = require('../../system_tests/external_tests_utils');
1212
const { DEFAULT_NUMBER_OF_WORKERS, WARP_TEST } = require('./warp_constants.js');
1313

1414
const usage = `

0 commit comments

Comments
 (0)