Skip to content

Commit d18b02c

Browse files
committed
reorganize directory structure
1 parent ecdee6a commit d18b02c

48 files changed

Lines changed: 17 additions & 15 deletions

Some content is hidden

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

.github/workflows/run-bats-tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
defaults:
1919
run:
20-
working-directory: ./irods/test/harness
20+
working-directory: ./test_harness/single
2121
strategy:
2222
matrix:
2323
python: ['3.9','3.13']
@@ -32,7 +32,9 @@ jobs:
3232

3333
- name: run tests
3434
run: |
35-
for script in ../scripts/test[0-9]* ../login_auth_test_must_run_manually.py
35+
for script in \
36+
../../irods/test/scripts/test[0-9]* \
37+
../../irods/test/login_auth_test_must_run_manually.py
3638
do
3739
./docker_container_driver.sh -V $script
3840
done

.github/workflows/run-local-suite.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
defaults:
1313
run:
14-
working-directory: ./irods/test/harness
14+
working-directory: ./test_harness/single
1515
strategy:
1616
matrix:
1717
python: ['3.9','3.13']
@@ -26,4 +26,4 @@ jobs:
2626

2727
- name: run tests
2828
run: |
29-
./docker_container_driver.sh -V ../scripts/run_suite_locally.sh
29+
./docker_container_driver.sh -V ../../irods/test/scripts/run_suite_locally.sh

.github/workflows/run-the-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
defaults:
1313
run:
14-
working-directory: ./docker-testing
14+
working-directory: ./test_harness/multi
1515
strategy:
1616
matrix:
1717
python: ['3.9','3.13']
@@ -32,7 +32,7 @@ jobs:
3232
sleep 1
3333
done
3434
echo "client_container = [$client_container]"
35-
docker exec "${client_container}" /repo_root/docker-testing/run_tests.sh
35+
docker exec "${client_container}" /repo_root/test_harness/multi/run_tests.sh
3636
3737
- name: Stop containers
3838
if: always()

irods/test/scripts/iinit.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

irods/test/scripts/run_suite_locally.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ run_tests() {
2323
source /pyN/bin/activate
2424
pip install -e /prc.rw[tests]
2525
cd /prc.rw/irods/test
26-
python /prc.rw/docker-testing/iinit.py \
26+
python /prc.rw/test_harness/utility/iinit.py \
2727
host localhost \
2828
port 1247 \
2929
user rods \
@@ -37,7 +37,7 @@ run_tests() {
3737
# Install PREP (Python Rule Engine Plugin).
3838
(
3939
set -e
40-
cd "$SCRIPT_DIR/../harness"
40+
cd "/prc/test_harness/single"
4141
apt update
4242
./install_python_rule_engine
4343
su irods -c './setup_python_rule_engine --wait'

irods/test/scripts/test010_issue_362_rogue_chars_in_pam_password.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
setup() {
99
[ -f /tmp/test010_one_time_initialize_flag ] || {
1010
rm -fr ~/.irods
11-
$BATS_TEST_DIRNAME/iinit.py host localhost \
11+
/prc/test_harness/utility/iinit.py host localhost \
1212
port 1247 \
1313
zone tempZone \
1414
user rods \
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)