Run tests for apache and nginx

Some of these are failing, but that's alright. Fixes coming up
alexbakker · Mar 3, 2024 · 1443e9b · 1443e9b
1 parent 75cd81b
commit 1443e9b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 5 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -25,7 +25,7 @@ jobs:
           cache: 'gradle'
       - name: Start WebDAV servers
         run: |
-          cd tests && docker compose up -d --wait --force-recreate --build --renew-anon-volumes --remove-orphans
+          cd tests && docker compose --project-directory tests up -d --wait --force-recreate --build --renew-anon-volumes --remove-orphans
       - name: Enable KVM group perms
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules

diff --git a/app/src/androidTest/java/me/alexbakker/webdav/WebDavTest.kt b/app/src/androidTest/java/me/alexbakker/webdav/WebDavTest.kt
@@ -60,6 +60,14 @@ class WebDavTest(private val testName: String, private val account: Account) {
                     username = "test",
                     password = "test"
                 )),
+                arrayOf("apache", Account(
+                    name = "Test",
+                    url = "http://${HOST}:8004",
+                )),
+                arrayOf("nginx", Account(
+                    name = "Test",
+                    url = "http://${HOST}:8002",
+                )),
             )
         }
     }
@@ -77,7 +85,7 @@ class WebDavTest(private val testName: String, private val account: Account) {
     private fun resetEnvironment() {
         val req = Request.Builder()
             .post(EMPTY_REQUEST)
-            .url("http://${HOST}:8000/reset/hacdias")
+            .url("http://${HOST}:8000/reset/${testName}")
             .build()
         val res = httpClient.newCall(req).execute()
         assertThat(res.code, equalTo(200))

diff --git a/tests/controller/init.sh b/tests/controller/init.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+umask 002
+
 populate_dir() {
     mkdir -p "$1"
     head -c 1000000 < /dev/urandom > "$1/1.bin"
@@ -10,6 +12,11 @@ populate_dir() {
 }
 
 WEBDAV_DIR="$1"
+if [ ! -d "${WEBDAV_DIR}"]; then
+    echo "No such directory: ${WEBDAV_DIR}"
+    exit 1
+fi
+
 find "${WEBDAV_DIR}" -mindepth 1 -delete
 
 populate_dir "${WEBDAV_DIR}"

diff --git a/tests/servers/apache/run.sh b/tests/servers/apache/run.sh
@@ -3,5 +3,6 @@
 DATA_DIR="/dav/apache"
 mkdir -p "${DATA_DIR}"
 chown -R daemon:daemon "${DATA_DIR}"
+chmod g+s "${DATA_DIR}"
 ln -s "${DATA_DIR}" /data
 exec httpd-foreground
diff --git a/tests/servers/nginx/Dockerfile b/tests/servers/nginx/Dockerfile
@@ -2,6 +2,5 @@ FROM alpine:3
 COPY ./run.sh /
 COPY ./default.conf /etc/nginx/http.d/default.conf
 RUN apk add curl nginx nginx-mod-http-dav-ext
-RUN mkdir /data
 CMD ["./run.sh"]
 EXPOSE 80
diff --git a/tests/servers/nginx/default.conf b/tests/servers/nginx/default.conf
@@ -4,6 +4,8 @@ server {
     location / {
         root /data;
         autoindex on;
+        access_log /dev/stdout;
+        error_log /dev/stdout;
         client_max_body_size 1g;
         create_full_put_path off;
         dav_methods PUT DELETE MKCOL COPY MOVE;

diff --git a/tests/servers/nginx/run.sh b/tests/servers/nginx/run.sh
@@ -2,7 +2,8 @@
 
 DATA_DIR="/dav/nginx"
 mkdir -p "${DATA_DIR}"
-chown -R www-data:www-data "${DATA_DIR}"
+chown -R nginx:nginx "${DATA_DIR}"
+chmod g+s "${DATA_DIR}"
 ln -s "${DATA_DIR}" /data
 
-exec nginx -g "daemon off;"
+exec nginx -g "daemon off;error_log /dev/stdout info;"