From 7f873966b57145de80c242e05afc9fd7638b7835 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Wed, 7 Jun 2023 00:21:15 +0200 Subject: [PATCH] test refactor: combine admin and plugin tests --- .github/workflows/integration-test.yaml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index b020e06..1cca9f6 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -101,24 +101,14 @@ jobs: run: | .github/integration-test.py show-logs basic-tests - - name: pytest integration-tests/test_admin_installer.py + - name: pytest integration-tests/test_simplest_plugin.py integration-tests/test_admin_installer.py run: | - .github/integration-test.py run-test admin-tests \ - --installer-args "--admin admin:admin" \ - ${{ matrix.extra_flags }} \ - test_admin_installer.py - timeout-minutes: 5 - - name: show logs - run: | - .github/integration-test.py show-logs admin-tests - - - name: pytest integration-tests/test_simplest_plugin.py - run: | - .github/integration-test.py run-test plugin-tests \ - --installer-args "--plugin /srv/src/integration-tests/plugins/simplest" \ + .github/integration-test.py run-test admin-plugin-tests \ + --installer-args "--admin admin:admin --plugin /srv/src/integration-tests/plugins/simplest" \ ${{ matrix.extra_flags }} \ + test_admin_installer.py \ test_simplest_plugin.py timeout-minutes: 5 - name: show logs run: | - .github/integration-test.py show-logs plugin-tests + .github/integration-test.py show-logs admin-plugin-tests