Merge pull request #15 from avast/first_action

de-activated pylint in Makefile. Tox.ini will be a better place for it

.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
       
 

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

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