From 488eecf0aafba8a18b8ad6f2707c73878dd180e6 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 25 Sep 2021 20:24:33 +0100 Subject: [PATCH] move pytest to HIL --- .github/workflows/dut_testing.yml | 4 ++-- .gitignore | 1 + {testlib => HIL}/Makefile | 0 {testlib => HIL}/__init__.py | 0 {testlib => HIL}/aprs_con.py | 8 ++++++++ {testlib => HIL}/common.py | 0 {testlib => HIL}/esp_dut.py | 2 +- {testlib => HIL}/requirements.txt | 0 {testlib => HIL}/testbinary/boot_app0.bin | Bin {testlib => HIL}/testbinary/bootloader_dio_40m.bin | Bin {testlib => HIL}/testbinary/firmware.bin | Bin {testlib => HIL}/testbinary/partitions.bin | Bin {testlib => HIL}/testconfig/testconfig.json | 0 {testlib => HIL}/tests/__init__.py | 0 {testlib => HIL}/tests/test_basic.py | 4 ++-- 15 files changed, 14 insertions(+), 5 deletions(-) rename {testlib => HIL}/Makefile (100%) rename {testlib => HIL}/__init__.py (100%) rename {testlib => HIL}/aprs_con.py (91%) rename {testlib => HIL}/common.py (100%) rename {testlib => HIL}/esp_dut.py (98%) rename {testlib => HIL}/requirements.txt (100%) rename {testlib => HIL}/testbinary/boot_app0.bin (100%) rename {testlib => HIL}/testbinary/bootloader_dio_40m.bin (100%) rename {testlib => HIL}/testbinary/firmware.bin (100%) rename {testlib => HIL}/testbinary/partitions.bin (100%) rename {testlib => HIL}/testconfig/testconfig.json (100%) rename {testlib => HIL}/tests/__init__.py (100%) rename {testlib => HIL}/tests/test_basic.py (92%) diff --git a/.github/workflows/dut_testing.yml b/.github/workflows/dut_testing.yml index 32070d1..ef76b6d 100644 --- a/.github/workflows/dut_testing.yml +++ b/.github/workflows/dut_testing.yml @@ -10,6 +10,6 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Install python reqirements - run: cd testlib && make install + run: cd HIL && make install - name: Run Tests - run: cd testlib && make test + run: cd HIL && make test diff --git a/.gitignore b/.gitignore index 0a973f3..4e07d82 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ report.xml output __pycache__ .pytest_cache +spiffs.bin diff --git a/testlib/Makefile b/HIL/Makefile similarity index 100% rename from testlib/Makefile rename to HIL/Makefile diff --git a/testlib/__init__.py b/HIL/__init__.py similarity index 100% rename from testlib/__init__.py rename to HIL/__init__.py diff --git a/testlib/aprs_con.py b/HIL/aprs_con.py similarity index 91% rename from testlib/aprs_con.py rename to HIL/aprs_con.py index 02f9c84..0c7f5c2 100644 --- a/testlib/aprs_con.py +++ b/HIL/aprs_con.py @@ -64,6 +64,14 @@ class AprsIs: yield line return None + def wait_for(self, towait): + for i in range(2, 10): + line = self.get_line() + for l in line: + if l == towait: + return + raise + @pytest.fixture def APRSIS(): diff --git a/testlib/common.py b/HIL/common.py similarity index 100% rename from testlib/common.py rename to HIL/common.py diff --git a/testlib/esp_dut.py b/HIL/esp_dut.py similarity index 98% rename from testlib/esp_dut.py rename to HIL/esp_dut.py index 4e00988..163e498 100644 --- a/testlib/esp_dut.py +++ b/HIL/esp_dut.py @@ -1,7 +1,7 @@ import os import pytest import serial -from testlib.common import runProcess +from HIL.common import runProcess class EspFlash: diff --git a/testlib/requirements.txt b/HIL/requirements.txt similarity index 100% rename from testlib/requirements.txt rename to HIL/requirements.txt diff --git a/testlib/testbinary/boot_app0.bin b/HIL/testbinary/boot_app0.bin similarity index 100% rename from testlib/testbinary/boot_app0.bin rename to HIL/testbinary/boot_app0.bin diff --git a/testlib/testbinary/bootloader_dio_40m.bin b/HIL/testbinary/bootloader_dio_40m.bin similarity index 100% rename from testlib/testbinary/bootloader_dio_40m.bin rename to HIL/testbinary/bootloader_dio_40m.bin diff --git a/testlib/testbinary/firmware.bin b/HIL/testbinary/firmware.bin similarity index 100% rename from testlib/testbinary/firmware.bin rename to HIL/testbinary/firmware.bin diff --git a/testlib/testbinary/partitions.bin b/HIL/testbinary/partitions.bin similarity index 100% rename from testlib/testbinary/partitions.bin rename to HIL/testbinary/partitions.bin diff --git a/testlib/testconfig/testconfig.json b/HIL/testconfig/testconfig.json similarity index 100% rename from testlib/testconfig/testconfig.json rename to HIL/testconfig/testconfig.json diff --git a/testlib/tests/__init__.py b/HIL/tests/__init__.py similarity index 100% rename from testlib/tests/__init__.py rename to HIL/tests/__init__.py diff --git a/testlib/tests/test_basic.py b/HIL/tests/test_basic.py similarity index 92% rename from testlib/tests/test_basic.py rename to HIL/tests/test_basic.py index 379f877..a40e310 100644 --- a/testlib/tests/test_basic.py +++ b/HIL/tests/test_basic.py @@ -1,5 +1,5 @@ -from testlib.esp_dut import ESP -from testlib.aprs_con import APRSIS, AprsIs +from HIL.esp_dut import ESP +from HIL.aprs_con import APRSIS, AprsIs def test_basic_port(ESP):