Move skip inside @setup functions

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
openhpc · Oct 4, 2024 · 373d462 · 373d462
1 parent bcad30b
commit 373d462
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/tests/oob/ipmitool b/tests/oob/ipmitool
@@ -8,14 +8,16 @@ if [ -s ./common/TEST_ENV ];then
     source ./common/TEST_ENV
 fi
 
-if [ ! -z "$SIMPLE_CI" ]; then
-	skip "Not supported in simple CI setup"
-fi
-
 if [ -n "$IPMI_PASSWORD" ];then
     export IPMI_PASSWORD
 fi
 
+setup() {
+    if [ -n "$SIMPLE_CI" ]; then
+        skip "Not supported in simple CI setup"
+    fi
+}
+
 @test "[OOB] ipmitool exists" {
     run which ipmitool
     assert_success

diff --git a/tests/oob/warewulf-ipmi b/tests/oob/warewulf-ipmi
@@ -12,12 +12,13 @@ if [ -n "$IPMI_PASSWORD" ];then
     export IPMI_PASSWORD
 fi
 
-@test "[warewulf-ipmi] ipmitool lanplus protocol" {
-
+setup() {
     if [ -n "$SIMPLE_CI" ]; then
         skip "Not supported in simple CI setup"
     fi
-
+}
+
+@test "[warewulf-ipmi] ipmitool lanplus protocol" {
     rpm -q --quiet warewulf-ipmi-ohpc || skip "Warewulf not installed, skipping warewulf-ipmitool check"
 
     run wwsh ipmi powerstatus c1