diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 0d32915..c99ba3c 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -10,11 +10,19 @@ jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + python: [ 3.9 ] steps: - uses: actions/checkout@v2 - + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python }} + - name: Install Tox and any other packages + run: pip install tox - name: Run check - run: make test + run: make check diff --git a/Makefile b/Makefile index 5a04fde..d8650d1 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,11 @@ .PHONY: test init deinit shipit pylint +# This is for CI on Github +check: tox.ini + tox -e py + +# Manual tests test: tox.ini tox; pylint --rcfile=pylint.rc *.py app/*.py plugins/base/*.py diff --git a/tests/test_machinecontrol.py b/tests/test_machinecontrol.py index c2f749e..75ed610 100644 --- a/tests/test_machinecontrol.py +++ b/tests/test_machinecontrol.py @@ -208,7 +208,7 @@ class TestMachineControl(unittest.TestCase): "vm_name": "target3", "group": "testgroup", "paw": "testpaw", - "machinepath": "target2w"}), self.attack_logger) + "machinepath": "target3"}), self.attack_logger) m.set_caldera_server("www.test.test") cmd = m.create_start_caldera_client_cmd() self.maxDiff = None