Merge pull request #11 from webb-ben/admin-test

Move admin test outside of docker example

.github/workflows/main.yml

@@ -160,22 +160,32 @@ jobs:
       matrix:
         include:
           - python-version: 3.8
-
+    env:
+      PYGEOAPI_CONFIG: "tests/pygeoapi-test-config-admin.yml"
+      PYGEOAPI_OPENAPI: "tests/pygeoapi-test-openapi-admin.yml"
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       name: Setup Python ${{ matrix.python-version }}
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Run pygeoapi with admin API ⚙️
-      run: |
-        cd docker/examples/admin
-        docker compose up -d --build
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: gunicorn python3-gevent
+        version: 1.0
     - name: Install requirements 📦
       run: |
         pip3 install -r requirements.txt
         pip3 install -r requirements-dev.txt
+        pip3 install -r requirements-admin.txt
         python3 setup.py install
+    - name: Run pygeoapi with admin API ⚙️
+      run: |
+        pygeoapi openapi generate ${PYGEOAPI_CONFIG} --output-file ${PYGEOAPI_OPENAPI}
+        gunicorn --bind 0.0.0.0:5000 \
+                 --reload \
+                 --reload-extra-file ${PYGEOAPI_CONFIG} \
+                 pygeoapi.flask_app:APP &
     - name: run integration tests ⚙️
       run: |
         pytest tests/test_admin_api.py

requirements-admin.txt

@@ -1 +1,3 @@
+filelock
 jsonpatch
+gunicorn

docker/examples/admin/admin.config.yml → tests/pygeoapi-test-config-admin.yml

@@ -29,9 +29,9 @@
 
 server:
     bind:
-        host: ${HOST}
-        port: ${PORT}
-    url: ${HOST}:${PORT}
+        host: 0.0.0.0
+        port: 5000
+    url: http://localhost:5000
     admin: true
     mimetype: application/json; charset=UTF-8
     encoding: utf-8
@@ -98,4 +98,4 @@ resources:
     hello-world:
         type: process
         processor:
-            name: ${PYGEOAPI_PROCESS}
+            name: HelloWorld