From 67d59710fae4eb05fcd4656b6b204caa9506df7d Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Mon, 14 Sep 2020 15:53:21 +0200 Subject: Change regular pyagl invocation to nohw In CI we will execute the 'not hwrequired' flag. Make this the default case in the test-suites. Bug-AGL: SPEC-3572 Signed-off-by: Jan-Simon Moeller Change-Id: I370bb3c12953d7455a1a4c06c573cbc10ee17bda --- common/scripts/pyagl-nohw-lava.sh | 7 +++++++ common/scripts/pyagl-regular-lava.sh | 7 ------- test-suites/short-smoke/pyagl-nohw-oneshot.yaml | 14 ++++++++++++++ test-suites/short-smoke/pyagl-regular-oneshot.yaml | 14 -------------- 4 files changed, 21 insertions(+), 21 deletions(-) create mode 100755 common/scripts/pyagl-nohw-lava.sh delete mode 100755 common/scripts/pyagl-regular-lava.sh create mode 100644 test-suites/short-smoke/pyagl-nohw-oneshot.yaml delete mode 100644 test-suites/short-smoke/pyagl-regular-oneshot.yaml diff --git a/common/scripts/pyagl-nohw-lava.sh b/common/scripts/pyagl-nohw-lava.sh new file mode 100755 index 0000000..1b0c7f3 --- /dev/null +++ b/common/scripts/pyagl-nohw-lava.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# for now play safe and only expect ethernet +export AGL_AVAILABLE_INTERFACES="ethernet" + +pytest --color=no --show-capture=no -k "not hwrequired" /usr/lib/python?.?/site-packages/pyagl/tests/ -L + + diff --git a/common/scripts/pyagl-regular-lava.sh b/common/scripts/pyagl-regular-lava.sh deleted file mode 100755 index a64d9d8..0000000 --- a/common/scripts/pyagl-regular-lava.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# for now play safe and only expect ethernet -export AGL_AVAILABLE_INTERFACES="ethernet" - -pytest --color=no --show-capture=no -k "regular and not hwrequired" /usr/lib/python?.?/site-packages/pyagl/tests/ -L - - diff --git a/test-suites/short-smoke/pyagl-nohw-oneshot.yaml b/test-suites/short-smoke/pyagl-nohw-oneshot.yaml new file mode 100644 index 0000000..6dd45f2 --- /dev/null +++ b/test-suites/short-smoke/pyagl-nohw-oneshot.yaml @@ -0,0 +1,14 @@ +# These tests are applicable if the board to be used has at least one CAN interface. + +metadata: + name: pyagl_nohw_oneshot + format: "Lava-Test-Shell Test Definition 1.0" + description: "pyagl_nohw_oneshot" + version: 1.0 + +run: + steps: + - echo "pyagl - no external hardware - oneshot" + - lava-test-set start pyagl-nohw-oneshot + - ./common/scripts/pyagl-nohw-lava.sh + - lava-test-set stop diff --git a/test-suites/short-smoke/pyagl-regular-oneshot.yaml b/test-suites/short-smoke/pyagl-regular-oneshot.yaml deleted file mode 100644 index 0bc53fd..0000000 --- a/test-suites/short-smoke/pyagl-regular-oneshot.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# These tests are applicable if the board to be used has at least one CAN interface. - -metadata: - name: pyagl_regular_oneshot - format: "Lava-Test-Shell Test Definition 1.0" - description: "pyagl_regular_oneshot" - version: 1.0 - -run: - steps: - - echo "pyagl regular oneshot" - - lava-test-set start pyagl-regular-oneshot - - ./common/scripts/pyagl-regular-lava.sh - - lava-test-set stop -- cgit 1.2.3-korg