test: rewrite testing script in python

.flake8

@@ -1,2 +1,3 @@
 [flake8]
 extend-ignore = E501, W504, W503, E126
+exclude = lib*, bin

.gitignore

@@ -1,5 +1,8 @@
-/test
 cert*
 .*.sw*
 /docs
 /repos
+bin/
+lib*/
+pyvenv.cfg
+CACHEDIR.TAG

.pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+testpaths =
+    test

README.md

@@ -29,14 +29,17 @@ Section 3: Testing and basic functionality
 
  - In order to verify that singularity is behaving correctly, you should run the test suite.
 
- - You will need to install some host packages needed by the testing script: flake8, shellcheck, jq, and curl.
-On Fedora these packages can be obtained by running `sudo dnf install -y python3-flake8 shellcheck jq curl`.
+ - You will need to install some host packages needed by the tests: shellcheck and jq
 
- - Now you can run `./test.sh`. If you followed the directions, the tests should pass.
+ On Fedora these packages can be obtained by running `sudo dnf install -y ShellCheck jq`
 
- - Note that recent versions of Fedora ship with `curl-minimal` rather than `curl`, and that the former does not support pop3s.
-If, when running the tests, you encounter an error like `"pop3s: protocol not supported"` you can first try `dnf swap libcurl-minimal libcurl`--
-failing that, you may need to run `dnf download libcurl.$(uname -m) && sudo dnf install --allowerasing ./libcurl*.rpm && rm libcurl*.rpm`.
+ - You will need to install some python packages needed by the tests
+
+ - Use a python virtual environment to obtain the correct versions: `virtualenv . && pip install -r requirements.txt`, assuming you have both `virtualenv` and `pip` installed
+
+On Fedora the packages needed to run those last two commands can be obtained by running `sudo dnf install -y python-virtualenv python-pip`
+
+ - Now you can run `pytest`. If you followed the directions, the tests should pass.
 
  - You will not be able to access the services using a normal web browser or email client without one more step as the
 services listening on unix sockets instead of TCP ports.

extenginx/Containerfile

@@ -5,30 +5,35 @@ RUN apk update && apk upgrade && apk add \
     openssl \
     ;
 
+
+ARG NGINX_HOSTNAME=localhost
+
 RUN mkdir /etc/ssl/nginx && \
 	cd /etc/ssl/nginx && \
 	openssl \
 		genpkey \
 		-genparam \
 		-algorithm DH \
 		-pkeyopt dh_paramgen_prime_len:2048 \
-		-out ssl-dhparams.pem \
+		-out ssl-dhparams.pem && \
+	 printf "[req]\n \
+distinguished_name=req\n \
+[ v3_ext ]\n \
+subjectAltName=DNS:${NGINX_HOSTNAME},IP:127.0.0.1\n" > openssl.cnf \
 	&& \
 	:
 
-ARG NGINX_HOSTNAME=localhost
-
 RUN cd /etc/ssl/nginx && \
-	openssl \
-		req \
-		-sha256 \
-		-newkey rsa:4096 \
+	openssl req \
 		-x509 \
+		-nodes \
 		-days 133337 \
-		-subj "/CN=${NGINX_HOSTNAME}" \
-		-noenc \
+		-newkey rsa:2048 \
 		-keyout privkey.pem \
 		-out fullchain.pem \
+		-subj "/CN=${NGINX_HOSTNAME}" \
+		-extensions v3_ext \
+		-config openssl.cnf \
 	&& \
 	:
 

git/admin.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
 
-DOCKER_COMPOSE=${DOCKER_COMPOSE:-podman-compose}
+PODMAN_COMPOSE=${PODMAN_COMPOSE:-podman-compose}
 
-$DOCKER_COMPOSE exec git ./create-repo.sh "$@"
+$PODMAN_COMPOSE exec git ./create-repo.sh "$@"

orbit/warpdrive.sh

@@ -4,6 +4,6 @@
 
 set -e
 
-DOCKER_COMPOSE=${DOCKER_COMPOSE:-podman-compose}
+PODMAN_COMPOSE=${PODMAN_COMPOSE:-podman-compose}
 
-$DOCKER_COMPOSE exec orbit ./hyperspace.py "$@"
+$PODMAN_COMPOSE exec orbit ./hyperspace.py "$@"

requirements.txt

@@ -0,0 +1,14 @@
+certifi==2025.1.31
+charset-normalizer==3.4.1
+flake8==7.1.2
+idna==3.10
+iniconfig==2.0.0
+mccabe==0.7.0
+packaging==24.2
+pluggy==1.5.0
+pycodestyle==2.12.1
+pyflakes==3.2.0
+pytest==8.3.4
+requests==2.31.0
+requests-unixsocket==0.3.0
+urllib3==2.3.0

script-lint.sh

@@ -6,7 +6,6 @@ require shellcheck
 set -ex
 
 shellcheck script-lint.sh
-shellcheck test.sh
 shellcheck orbit/warpdrive.sh
 shellcheck denis/configure.sh
 shellcheck mailman/inspector.sh