From f145ae967d7de47e0a28870c72742cb286e6957c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Tue, 24 Nov 2020 07:48:13 +0100
Subject: [PATCH] run addon pytest scripts in github action because something
 fails on travis

---
 .github/workflows/scriptcheck.yml | 9 +++++++++
 .travis.yml                       | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml
index 47f17faaa..00390a5bd 100644
--- a/.github/workflows/scriptcheck.yml
+++ b/.github/workflows/scriptcheck.yml
@@ -27,6 +27,8 @@ jobs:
           sudo pip3 install pexpect
           sudo pip3 install pylint
           sudo pip3 install unittest2
+          sudo pip install pytest
+          sudo pip3 install pytest
           
       - name: run Shellcheck
         run: |
@@ -46,3 +48,10 @@ jobs:
       - name: check .json files
         run: |
           find . -name '*.json' | xargs -n 1 python3 -m json.tool > /dev/null
+
+      - name: test addons
+        run: |
+          make -s
+          PYTHONPATH=./addons python -m pytest addons/test/test-*.py
+          PYTHONPATH=./addons python3 -m pytest addons/test/test-*.py
+
diff --git a/.travis.yml b/.travis.yml
index 332ce0663..16531efc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -203,7 +203,8 @@ script:
   - cd ../cppcheck\ 2/test/cli # path with space
   - python -m pytest test-*.py
   - cd -
-# Testing addons (temporarily disabled because Travis fails)
+# Testing addons (disabled 2020-11-24 because Travis fails, TODO try to enable these)
+#  - PYTHONPATH=./addons python -m pytest addons/test/test-*.py
 #  - PYTHONPATH=./addons python3 -m pytest addons/test/test-*.py
 
 notifications: