Skip to content

Commit cf7b804

Browse files
committed
[_TENTATIVE_SQUASH] mostly review based changes ...
(including the below commits): reorganize directory structure more misc. changes, mostly review-based add comment re pg_isready update key download & signing make directory /etc/apt/keyrings specify location of xmlrunner reports in multiple-node README get rid of symlinks include all tests add shebang line
1 parent 7744dde commit cf7b804

File tree

67 files changed

+472
-360
lines changed

Some content is hidden

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

67 files changed

+472
-360
lines changed

.github/workflows/README.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# https://github.com/actions/starter-workflows/blob/master/ci/python-package.yml
33
# (C) Github, MIT License
44

5+
# Static type checking tests using `mypy`.
6+
57
name: "Python type checking"
68

79
on: [push, pull_request]

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

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Run a set of tests, each in its own container and with a potentially customized setup.
2+
3+
# To this end, each test is launched via docker_container_driver.sh, part of the single-node
4+
# test harness machinery whose implementation and documentation is to be found in the
5+
# `irods/test/harness` directory.
6+
7+
# A test may be written as a Bash or BATS script, but the only real requirement is that it be
8+
# executable.
9+
10+
name: run-test-programs-single-node
11+
12+
on: [push, pull_request]
13+
14+
jobs:
15+
tests:
16+
name: Python ${{ matrix.python }}, iRODS ${{ matrix.irods_server }}
17+
runs-on: ubuntu-latest
18+
defaults:
19+
run:
20+
working-directory: ./test_harness/single_node
21+
strategy:
22+
matrix:
23+
python: ['3.9','3.13']
24+
irods_server: ['4.3.4','5.0.2']
25+
26+
steps:
27+
- name: Checkout
28+
uses: actions/checkout@v4
29+
30+
- name: Build images
31+
run: ./create_docker_images.sh "${{ matrix.irods_server }}" "${{ matrix.python }}"
32+
33+
- name: run tests
34+
run: |
35+
for script in \
36+
../../irods/test/scripts/test[0-9]* \
37+
../../irods/test/login_auth_test_*.py
38+
do
39+
./docker_container_driver.sh -V $script
40+
done

.github/workflows/run-the-tests.yml renamed to .github/workflows/run-test-suite-multiple-node.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
name: run-the-tests
1+
# Create a networked set of containers (via a Docker compose project) on which to run the client test suite.
2+
# (For further information, see the README in `docker-testing`.)
3+
4+
name: run-test-suite-multiple-node
25

36
on: [push, pull_request]
47

58
jobs:
69
tests:
7-
timeout-minutes: 20
8-
910
name: Python ${{ matrix.python }}, iRODS ${{ matrix.irods_server }}
1011
runs-on: ubuntu-latest
1112
defaults:
1213
run:
13-
working-directory: ./docker-testing
14+
working-directory: ./test_harness/multiple_node
1415
strategy:
1516
matrix:
1617
python: ['3.9','3.13']
@@ -31,8 +32,8 @@ jobs:
3132
sleep 1
3233
done
3334
echo "client_container = [$client_container]"
34-
docker exec "${client_container}" /repo_root/docker-testing/run_tests.sh
35+
docker exec "${client_container}" /repo_root/test_harness/multiple_node/run_tests.sh
3536
3637
- name: Stop containers
3738
if: always()
38-
run: ./stop_containers.sh "${{ matrix.irods_server }}" "${{ matrix.python }}"
39+
run: ./stop_containers.sh "${{ matrix.irods_server }}"
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
name: run-bats-tests
1+
# Run the client test suite in a Docker container, targeting a locally running instance of the iRODS server.
2+
# (Documentation and implementation for the test harness may be found in `irods/test/harness`.)
3+
4+
name: run-test-suite-single-node
25

36
on: [push, pull_request]
47

58
jobs:
69
tests:
7-
timeout-minutes: 20
8-
910
name: Python ${{ matrix.python }}, iRODS ${{ matrix.irods_server }}
1011
runs-on: ubuntu-latest
1112
defaults:
1213
run:
13-
working-directory: ./irods/test/harness
14+
working-directory: ./test_harness/single_node
1415
strategy:
1516
matrix:
1617
python: ['3.9','3.13']
@@ -25,6 +26,4 @@ jobs:
2526

2627
- name: run tests
2728
run: |
28-
for script in ../scripts/test[0-9]*; do
29-
./docker_container_driver.sh -V $script
30-
done
29+
./docker_container_driver.sh -V ../../irods/test/scripts/run_suite_locally.sh

docker-testing/README.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

docker-testing/harness-docker-compose-irods-4.yml

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

docker-testing/harness-docker-compose-irods-5.yml

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

docker-testing/irods_catalog_provider_4/send_oneshot

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)