Skip to content

change tests directory structure #9133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5,493 −834
Open

change tests directory structure #9133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
src/test/system_tests/ceph_s3_tests/s3-tests/**
src/test/external_tests/ceph_s3_tests/s3-tests/**
2 changes: 1 addition & 1 deletion .github/workflows/nightly-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
-e NEWAWSPROJSECRET=${{ secrets.NEWAWSPROJSECRET }} \
-e NEWAZUREPROJKEY=${{ secrets.NEWAZUREPROJKEY }} \
-e NEWAZUREPROJSECRET=${{ secrets.NEWAZUREPROJSECRET }} \
--name test1 noobaa-tester ./src/test/unit_tests/run_npm_test_on_test_container.sh -s test_s3_ops.js
--name test1 noobaa-tester ./src/test/framework/run_npm_test_on_test_container.sh -s test_s3_ops.js
22 changes: 11 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ root-perm-test: tester
@$(call create_docker_network)
@$(call run_mongo)
@echo "\033[1;34mRunning root permission tests\033[0m"
$(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
$(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
@$(call stop_noobaa)
@$(call stop_mongo)
@$(call remove_docker_network)
Expand All @@ -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/unit_tests/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 $(testname)
@$(call stop_noobaa)
@$(call stop_blob_mock)
@$(call stop_mongo)
Expand All @@ -290,7 +290,7 @@ run-single-test: tester
run-nc-tests: tester
@$(call create_docker_network)
@echo "\033[1;34mRunning nc tests\033[0m"
$(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
$(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
@$(call stop_noobaa)
@$(call remove_docker_network)
.PHONY: run-nc-tests
Expand All @@ -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/unit_tests/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 $(testname)
@$(call stop_noobaa)
@$(call stop_postgres)
@$(call stop_blob_mock)
Expand Down Expand Up @@ -346,7 +346,7 @@ test-cephs3: tester
@$(call create_docker_network)
@$(call run_postgres)
@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 "POSTGRES_DBNAME=coretest" -v $(PWD)/logs:/logs $(TESTER_TAG) "./src/test/system_tests/ceph_s3_tests/run_ceph_test_on_test_container.sh"
$(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"
@$(call stop_noobaa)
@$(call stop_postgres)
@$(call remove_docker_network)
Expand All @@ -357,23 +357,23 @@ test-warp: tester
@$(call create_docker_network)
@$(call run_postgres)
@echo "\033[1;34mRunning warp tests\033[0m"
$(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"
$(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"
@$(call stop_noobaa)
@$(call stop_postgres)
@$(call remove_docker_network)
.PHONY: test-warp

test-nc-warp: tester
@echo "\033[1;34mRunning warp tests on NC environment\033[0m"
$(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"
$(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"
.PHONY: test-nc-warp

test-mint: tester
@echo "\033[1;34mRunning mint tests with Postgres.\033[0m"
@$(call create_docker_network)
@$(call run_postgres)
@echo "\033[1;34mRunning mint tests\033[0m"
$(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"
$(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"
sleep 180
$(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
@echo "\033[1;34mPrinting noobaa configuration and logs\033[0m"
Expand All @@ -391,7 +391,7 @@ test-mint: tester
test-nc-mint: tester
@echo "\033[1;34mRunning mint tests on NC environment\033[0m"
@$(call create_docker_network)
$(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"
$(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"
sleep 15
$(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
@echo "\033[1;34mPrinting noobaa configuration and logs\033[0m"
Expand All @@ -406,7 +406,7 @@ test-nc-mint: tester

test-nsfs-cephs3: tester
@echo "\033[1;34mRunning Ceph S3 tests on NSFS Standalone platform\033[0m"
$(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"
$(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"
.PHONY: test-nsfs-cephs3

test-sanity: tester
Expand Down Expand Up @@ -441,7 +441,7 @@ test-aws-sdk-clients: build-aws-client
@$(call create_docker_network)
@$(call run_postgres)
@echo "\033[1;34mRunning aws sdk clients 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 "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
$(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
@$(call stop_noobaa)
@$(call stop_postgres)
@$(call remove_docker_network)
Expand Down
8 changes: 4 additions & 4 deletions docs/NooBaaNonContainerized/CI&Tests.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ Run `NC mocha tests` with root permissions -
* Run `NC mocha` tests **locally** -
**Warning:** Running tests locally will do changes to your file system.
* Run **all** NC mocha tests locally -
Command: `sudo NC_CORETEST=true node node_modules/mocha/bin/mocha src/test/unit_tests/nc_index.js`.
Command: `sudo NC_CORETEST=true node node_modules/mocha/bin/mocha src/test/utils/index/nc_index.js`.

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

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

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


#### NSFS Tests Files List
Expand Down
4 changes: 2 additions & 2 deletions docs/dev_guide/ceph_s3_tests/ceph_s3_tests_guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,13 @@ node ./src/test/system_tests/ceph_s3_tests/test_ceph_s3_config_setup.js
For example:

```bash
S3TEST_CONF=${PWD}/src/test/system_tests/ceph_s3_tests/test_ceph_s3_config.conf tox -c src/test/system_tests/ceph_s3_tests/s3-tests/tox.ini -- --disable-pytest-warnings ${PWD}/src/test/system_tests/ceph_s3_tests/s3-tests/s3tests/functional/test_headers.py::test_bucket_create_contentlength_none
S3TEST_CONF=${PWD}/src/test/external_tests/ceph_s3_tests/test_ceph_s3_config.conf tox -c src/test/external_tests/ceph_s3_tests/s3-tests/tox.ini -- --disable-pytest-warnings ${PWD}/src/test/external_tests/ceph_s3_tests/s3-tests/s3tests/functional/test_headers.py::test_bucket_create_contentlength_none
```

### 5) Run a Test (Inside The Tester Pod)
To run a test, from noobaa working directory:
```bash
S3TEST_CONF=${PWD}/src/test/system_tests/ceph_s3_tests/test_ceph_s3_config.conf tox -c src/test/system_tests/ceph_s3_tests/s3-tests/tox.ini ${PWD}/src/test/system_tests/ceph_s3_tests/s3-tests/<test_name>
S3TEST_CONF=${PWD}/src/test/external_tests/ceph_s3_tests/test_ceph_s3_config.conf tox -c src/test/external_tests/ceph_s3_tests/s3-tests/tox.ini ${PWD}/src/test/external_tests/ceph_s3_tests/s3-tests/<test_name>
```
This should run the test on the noobaa deployment we've set up.

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"test": "npm run lint && npm run mocha",
"ts": "tsc",
"lint": "eslint src --quiet",
"mocha": "node --allow-natives-syntax ./node_modules/.bin/_mocha src/test/unit_tests/index.js",
"mocha": "node --allow-natives-syntax ./node_modules/.bin/_mocha src/test/utils/index/index.js",
"jest": "sudo npx jest",
"----": "-----------------------------------------------------------------",
"start": "node --unhandled-rejections=warn src/cmd",
Expand Down
12 changes: 6 additions & 6 deletions src/deploy/NVA_build/Tests.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ WORKDIR /root/node_modules/noobaa-core/
# Size: ~ 83.9 MB
#
##############################################################
RUN ./src/test/system_tests/ceph_s3_tests/test_ceph_s3_deploy.sh $(pwd)
RUN ./src/test/external_tests/ceph_s3_tests/test_ceph_s3_deploy.sh $(pwd)
# add group permissions to s3-tests directory (tox needs it in order to run)
RUN cd ./src/test/system_tests/ceph_s3_tests/ && \
RUN cd ./src/test/external_tests/ceph_s3_tests/ && \
chgrp -R 0 s3-tests && \
chmod -R g=u s3-tests

Expand All @@ -51,10 +51,10 @@ RUN npm install
#
##############################################################
COPY ./src/deploy/NVA_build/standalone_deploy.sh ./src/deploy/NVA_build/standalone_deploy.sh
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
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
COPY ./src/deploy/NVA_build/standalone_deploy_nsfs.sh ./src/deploy/NVA_build/standalone_deploy_nsfs.sh
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
RUN chmod +x ./src/test/system_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh
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
RUN chmod +x ./src/test/external_tests/ceph_s3_tests/run_ceph_nsfs_test_on_test_container.sh
COPY ./src/test/system_tests/run_sanity_test_on_test_container.sh ./src/test/system_tests/run_sanity_test_on_test_container.sh

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

USER 10001:0
CMD ["./src/test/unit_tests/run_npm_test_on_test_container.sh"]
CMD ["./src/test/framework/run_npm_test_on_test_container.sh"]
0 .../different_clients/go_aws_sdkv2_client.go → .../different_clients/go_aws_sdkv2_client.go
View file
Open in desktop
File renamed without changes.
0 ...ent_clients/run_go_sdkv2_client_script.js → ...ent_clients/run_go_sdkv2_client_script.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/run_ceph_nsfs_test_on_test_container.sh → ...s/run_ceph_nsfs_test_on_test_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ mkdir -p ${CEPH_TEST_LOGS_DIR}
# ====================================================================================

# Run the tests
./src/test/system_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_and_run_s3_tests.sh
./src/test/external_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_and_run_s3_tests.sh
2 changes: 1 addition & 1 deletion ..._tests/run_ceph_test_on_test_container.sh → ..._tests/run_ceph_test_on_test_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ mkdir -p ${CEPH_TEST_LOGS_DIR}
# ====================================================================================

# Run the tests
./src/test/system_tests/ceph_s3_tests/test_ceph_s3_config_and_run_s3_tests.sh
./src/test/external_tests/ceph_s3_tests/test_ceph_s3_config_and_run_s3_tests.sh

# ====================================================================================
0 ...-tests-lists/nsfs_s3_tests_black_list.txt → ...-tests-lists/nsfs_s3_tests_black_list.txt
View file
Open in desktop
File renamed without changes.
0 ...ests-lists/nsfs_s3_tests_pending_list.txt → ...ests-lists/nsfs_s3_tests_pending_list.txt
View file
Open in desktop
File renamed without changes.
0 ...ts/s3-tests-lists/s3_tests_black_list.txt → ...ts/s3-tests-lists/s3_tests_black_list.txt
View file
Open in desktop
File renamed without changes.
0 .../s3-tests-lists/s3_tests_pending_list.txt → .../s3-tests-lists/s3_tests_pending_list.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...t_ceph_nsfs_s3_config_and_run_s3_tests.sh → ...t_ceph_nsfs_s3_config_and_run_s3_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#!/bin/bash
set -x

CEPH_S3_DIRECTORY="src/test/system_tests/ceph_s3_tests"
CEPH_S3_DIRECTORY="src/test/external_tests/ceph_s3_tests"
CEPH_S3_TESTS_CONFIG="${CEPH_S3_DIRECTORY}/test_ceph_nsfs_s3_config_setup.js"
CEPH_S3_RUN_TESTS="${CEPH_S3_DIRECTORY}/test_ceph_s3.js"
S3_CEPH_TEST_BLACKLIST="${CEPH_S3_DIRECTORY}/s3-tests-lists/nsfs_s3_tests_black_list.txt"
Expand Down
2 changes: 1 addition & 1 deletion ...3_tests/test_ceph_nsfs_s3_config_setup.js → ...3_tests/test_ceph_nsfs_s3_config_setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dbg.set_process_name('test_ceph_s3');
const fs = require('fs');
const os_utils = require('../../../util/os_utils');
const { CEPH_TEST } = require('./test_ceph_s3_constants.js');
const { get_access_keys, create_account } = require('../nc_test_utils');
const { get_access_keys, create_account } = require('../../utils/nc_test_utils');

async function main() {
try {
Expand Down
0 ...ystem_tests/ceph_s3_tests/test_ceph_s3.js → ...ernal_tests/ceph_s3_tests/test_ceph_s3.js
View file
Open in desktop
File renamed without changes.
0 ...ts/ceph_s3_tests/test_ceph_s3_config.conf → ...ts/ceph_s3_tests/test_ceph_s3_config.conf
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/test_ceph_s3_config_and_run_s3_tests.sh → ...s/test_ceph_s3_config_and_run_s3_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#!/bin/bash
set -x

CEPH_S3_DIRECTORY="src/test/system_tests/ceph_s3_tests"
CEPH_S3_DIRECTORY="src/test/external_tests/ceph_s3_tests"
CEPH_S3_TESTS_CONFIG="${CEPH_S3_DIRECTORY}/test_ceph_s3_config_setup.js"
CEPH_S3_RUN_TESTS="${CEPH_S3_DIRECTORY}/test_ceph_s3.js"
S3_CEPH_TEST_BLACKLIST="${CEPH_S3_DIRECTORY}/s3-tests-lists/s3_tests_black_list.txt"
Expand Down
0 ...eph_s3_tests/test_ceph_s3_config_setup.js → ...eph_s3_tests/test_ceph_s3_config_setup.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/ceph_s3_tests/test_ceph_s3_constants.js → ...s/ceph_s3_tests/test_ceph_s3_constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const FS_ROOT_1 = '/tmp/nsfs_root1/';
const FS_ROOT_2 = '/tmp/nsfs_root2/';

const CEPH_TEST = {
test_dir: 'src/test/system_tests/ceph_s3_tests/',
test_dir: 'src/test/external_tests/ceph_s3_tests/',
s3_test_dir: 's3-tests/',
ceph_config: 'test_ceph_s3_config.conf',
tox_config: 'tox.ini',
Expand Down
2 changes: 1 addition & 1 deletion ...ests/ceph_s3_tests/test_ceph_s3_deploy.sh → ...ests/ceph_s3_tests/test_ceph_s3_deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ else
NOOBAA_DIR=${1}
fi

CEPH_S3_TESTS_PATH="src/test/system_tests/ceph_s3_tests"
CEPH_S3_TESTS_PATH="src/test/external_tests/ceph_s3_tests"
mkdir -p /${NOOBAA_DIR}/${CEPH_S3_TESTS_PATH}
cd /${NOOBAA_DIR}/${CEPH_S3_TESTS_PATH}

Expand Down
0 ...ceph_s3_tests/test_ceph_s3_deployment.yml → ...ceph_s3_tests/test_ceph_s3_deployment.yml
View file
Open in desktop
File renamed without changes.
0 ..._tests/ceph_s3_tests/test_ceph_s3_job.yml → ..._tests/ceph_s3_tests/test_ceph_s3_job.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...test/system_tests/external_tests_utils.js → ...st/external_tests/external_tests_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

const api = require('../../api');
const SensitiveString = require('../../util/sensitive_string');
const { get_account, create_account, create_bucket } = require('./nc_test_utils');
const { get_account, create_account, create_bucket } = require('../utils/nc_test_utils');

/**
* get_global_rpc_client returns a global RPC client.
Expand Down
0 src/test/system_tests/mint/configure_mint.js → ...est/external_tests/mint/configure_mint.js
View file
Open in desktop
File renamed without changes.
0 src/test/system_tests/mint/mint_constants.js → ...est/external_tests/mint/mint_constants.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ..._tests/mint/run_mint_on_test_container.sh → ..._tests/mint/run_mint_on_test_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ mkdir -p ${CEPH_TEST_LOGS_DIR}
cd /root/node_modules/noobaa-core/

# Configure the mint test
node ./src/test/system_tests/mint/configure_mint.js
node ./src/test/external_tests/mint/configure_mint.js
Loading