From f7f3b6cec5311e4296e9e67af44921e89b4b0cbb Mon Sep 17 00:00:00 2001 From: Allison Thackston Date: Sun, 12 Dec 2021 19:25:48 -0800 Subject: [PATCH 1/2] Update test to separate steps in github action --- .github/workflows/test.yml | 9 ++++++--- tests/run_linters.sh | 1 + tests/test.sh | 5 ----- tests/test_local.sh | 4 +++- 4 files changed, 10 insertions(+), 9 deletions(-) delete mode 100755 tests/test.sh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2fd83fc2..0428a615 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,9 +22,12 @@ jobs: sudo apt-get update sudo apt-get install -y bats gcc python -m pip install --upgrade pip - - name: Test - run: | - ./tests/test.sh + - name: Lint + run: ./tests/run_linters.sh + - name: Unit tests + run: ./tests/run_unit_tests.sh + - name: Integration tests + run: ./tests/run_integration_tests.sh check-docs: runs-on: ubuntu-latest diff --git a/tests/run_linters.sh b/tests/run_linters.sh index 90497181..a5d3aff5 100755 --- a/tests/run_linters.sh +++ b/tests/run_linters.sh @@ -1,5 +1,6 @@ #!/bin/bash set -e +pip install flake8 pydocstyle # md file="test.snippet" # ### Lint # diff --git a/tests/test.sh b/tests/test.sh deleted file mode 100755 index 658c4c00..00000000 --- a/tests/test.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e -./tests/run_unit_tests.sh -./tests/run_integration_tests.sh -./tests/run_linters.sh diff --git a/tests/test_local.sh b/tests/test_local.sh index f87eff61..8f2f0ab7 100755 --- a/tests/test_local.sh +++ b/tests/test_local.sh @@ -30,7 +30,9 @@ docker build -t mkdocs-simple-test-runner:$1 -f- . <" -docker run --rm -it mkdocs-simple-test-runner:$1 tests/test.sh +docker run --rm -it mkdocs-simple-test-runner:$1 tests/run_unit_tests.sh +docker run --rm -it mkdocs-simple-test-runner:$1 tests/run_linters.sh +docker run --rm -it mkdocs-simple-test-runner:$1 tests/run_integration_tests.sh } if [[ ! -z "$PYTHON_37_ONLY" ]]; then From 689dedd1509892ac91e60ecb627f31407bd9fdda Mon Sep 17 00:00:00 2001 From: Allison Thackston Date: Mon, 20 Dec 2021 02:31:47 +0000 Subject: [PATCH 2/2] move intallation to script --- .github/workflows/test.yml | 5 ----- tests/run_integration_tests.sh | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0428a615..2ea2a623 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,11 +17,6 @@ jobs: uses: actions/setup-python@v2.3.1 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y bats gcc - python -m pip install --upgrade pip - name: Lint run: ./tests/run_linters.sh - name: Unit tests diff --git a/tests/run_integration_tests.sh b/tests/run_integration_tests.sh index d3dea0b8..c582ee1b 100755 --- a/tests/run_integration_tests.sh +++ b/tests/run_integration_tests.sh @@ -1,5 +1,6 @@ #!/bin/bash set -e +sudo apt-get install bats pip install -r requirements.txt pip install -e . # md file="test.snippet"