From 85b7cb34685a73cbbcb2c086c93d212dbd4e7526 Mon Sep 17 00:00:00 2001 From: Schrolli91 Date: Fri, 17 Apr 2020 23:38:14 +0200 Subject: [PATCH 1/5] add py 3.8 for tests --- .github/workflows/run_pytest.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index 1b12138..cd60fa9 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -9,22 +9,27 @@ jobs: max-parallel: 3 matrix: os: [ubuntu-latest] - python-version: [3.5, 3.6, 3.7] + python-version: [3.5, 3.6, 3.7, 3.8] runs-on: ${{matrix.os}} + steps: - uses: actions/checkout@v1 + - name: Set up Python ${{matrix.python-version}} at ${{matrix.os}} uses: actions/setup-python@v1 with: python-version: ${{matrix.python-version}} + - name: Install dependencies run: | python -m pip install --upgrade pip pip install -r requirements.txt mkdir log/ + - name: Test with pytest run: | pytest -c 'test/pytest.ini' + - name: Save artifacts uses: actions/upload-artifact@master with: From af2fa094a05e2a2603407de3aace1297903b7fd3 Mon Sep 17 00:00:00 2001 From: Schrolli91 Date: Fri, 17 Apr 2020 23:40:43 +0200 Subject: [PATCH 2/5] remove max parallel --- .github/workflows/run_pytest.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index cd60fa9..30b9fe5 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -6,7 +6,6 @@ jobs: build: strategy: - max-parallel: 3 matrix: os: [ubuntu-latest] python-version: [3.5, 3.6, 3.7, 3.8] @@ -29,7 +28,7 @@ jobs: - name: Test with pytest run: | pytest -c 'test/pytest.ini' - + - name: Save artifacts uses: actions/upload-artifact@master with: From 940075ed85d0c6cff2beffd206a031041046e791 Mon Sep 17 00:00:00 2001 From: Jan Speller Date: Tue, 14 Apr 2020 22:34:17 +0200 Subject: [PATCH 3/5] Add Fix for descriptor --- module/descriptor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/descriptor.py b/module/descriptor.py index 77a28f8..f14f153 100644 --- a/module/descriptor.py +++ b/module/descriptor.py @@ -42,10 +42,10 @@ class BoswatchModule(ModuleBase): @param bwPacket: A BOSWatch packet instance""" for descriptor in self.config: + bwPacket.set(descriptor.get("descrField"), bwPacket.get(descriptor.get("scanField"))) for description in descriptor.get("descriptions"): if not bwPacket.get(descriptor.get("scanField")): break # scanField is not available in this packet - bwPacket.set(descriptor.get("descrField"), description.get("for")) if str(description.get("for")) == bwPacket.get(descriptor.get("scanField")): logging.debug("Description '%s' added in packet field '%s'", description.get("add"), descriptor.get("descrField")) From bfa9b0b3ceec08871c2cf3dfe9a9a241209aebc2 Mon Sep 17 00:00:00 2001 From: Jan Speller Date: Sat, 18 Apr 2020 14:09:59 +0200 Subject: [PATCH 4/5] return bwpacket if scanField is None --- module/descriptor.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/descriptor.py b/module/descriptor.py index f14f153..b470c83 100644 --- a/module/descriptor.py +++ b/module/descriptor.py @@ -42,6 +42,8 @@ class BoswatchModule(ModuleBase): @param bwPacket: A BOSWatch packet instance""" for descriptor in self.config: + if bwPacket.get(descriptor.get("scanField")) is None: + return bwPacket bwPacket.set(descriptor.get("descrField"), bwPacket.get(descriptor.get("scanField"))) for description in descriptor.get("descriptions"): if not bwPacket.get(descriptor.get("scanField")): From fde99396b8cdc1a742aaa4bd61f0c7d98e0046e2 Mon Sep 17 00:00:00 2001 From: Jan Speller Date: Sat, 18 Apr 2020 14:14:56 +0200 Subject: [PATCH 5/5] fix error --- module/descriptor.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/module/descriptor.py b/module/descriptor.py index b470c83..cf17530 100644 --- a/module/descriptor.py +++ b/module/descriptor.py @@ -42,12 +42,10 @@ class BoswatchModule(ModuleBase): @param bwPacket: A BOSWatch packet instance""" for descriptor in self.config: - if bwPacket.get(descriptor.get("scanField")) is None: - return bwPacket + if not bwPacket.get(descriptor.get("scanField")): + break # scanField is not available in this packet bwPacket.set(descriptor.get("descrField"), bwPacket.get(descriptor.get("scanField"))) for description in descriptor.get("descriptions"): - if not bwPacket.get(descriptor.get("scanField")): - break # scanField is not available in this packet if str(description.get("for")) == bwPacket.get(descriptor.get("scanField")): logging.debug("Description '%s' added in packet field '%s'", description.get("add"), descriptor.get("descrField"))