From 8063ac6f9d54bcdc914a06b48a8ef62ea9b33614 Mon Sep 17 00:00:00 2001
From: Denis Rouzaud <denis.rouzaud@gmail.com>
Date: Fri, 20 Oct 2023 06:17:20 +0200
Subject: [PATCH] fix endpoint url in conformance

---
 .github/workflows/conformance.yml    | 2 +-
 docker/conformance/Dockerfile        | 2 --
 tests/conformance/test-run-props.xml | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
index 36e432ea..6e271dcc 100644
--- a/.github/workflows/conformance.yml
+++ b/.github/workflows/conformance.yml
@@ -58,8 +58,8 @@ jobs:
           docker compose --profile testing_conformance up --build -d
 
           # deploy static files and migrate database
-          docker compose exec django python manage.py collectstatic --no-input
           docker compose exec django python manage.py migrate --no-input
+          docker compose exec django python manage.py populate_users
           docker compose exec django python manage.py populate_data
 
       - name: Healthcheck
diff --git a/docker/conformance/Dockerfile b/docker/conformance/Dockerfile
index 0e9a7983..7bc5625e 100644
--- a/docker/conformance/Dockerfile
+++ b/docker/conformance/Dockerfile
@@ -16,8 +16,6 @@ RUN mvn dependency:resolve dependency:resolve-plugins dependency:copy-dependenci
 # Install offline to avoid triggering new dependency update
 RUN mvn install -DskipTests -Dmaven.javadoc.skip
 
-# TODO: Should get the version from build context
-# ARG VERSION=1.5-SNAPSHOT  # done above
 ENV VERSION=${VERSION}
 
 CMD ["sh", "-c", "/build/run/run.sh"]
diff --git a/tests/conformance/test-run-props.xml b/tests/conformance/test-run-props.xml
index 35888b8a..fb515870 100644
--- a/tests/conformance/test-run-props.xml
+++ b/tests/conformance/test-run-props.xml
@@ -2,5 +2,5 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
   <comment>Test run arguments</comment>
-  <entry key="iut">http://django:8000/oapif/</entry>
+  <entry key="iut">http://django:8000/oapif</entry>
 </properties>