Skip to content

Commit 54e9078

Browse files
matmaciejematmacieje
authored
pfSense & OPNsense: test skipping with ENV ID (#1048)
* pfSense & OPNsense: test skipping with ENV ID dasharo-compatibility/os-opnsense.robot: dasharo-compatibility/os-pfsense.robot: Test suites are skipping in Suite Setup if BSD ENV IDs are not present in TESTED_LINUX_DISTROS variable. Signed-off-by: Mateusz Maciejewski <[email protected]> * TESTED_BSD_DISTROS variable introduced to default.robot New "tested distros" variable introduced to skip BSD tests (pfSense & OPN sense). Empty list defined in default.robot. Signed-off-by: Mateusz Maciejewski <[email protected]> * TESTED_BSD_DISTROS populated for Protectli platforms. Signed-off-by: Mateusz Maciejewski <[email protected]> --------- Signed-off-by: Mateusz Maciejewski <[email protected]>
1 parent 9db1f5a commit 54e9078

File tree

4 files changed

+10
-22
lines changed

4 files changed

+10
-22
lines changed

‎dasharo-compatibility/os-opnsense.robot‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ Resource ../keys.robot
1313
# Log Out And Close Connection - elementary teardown keyword for all tests.
1414
Suite Setup Run Keywords
1515
... Prepare Test Suite
16+
... AND
17+
... Skip If '${ENV_ID_OPNSENSE}' not in ${TESTED_BSD_DISTROS} OPNsense tests not supported
1618
Suite Teardown Run Keywords
1719
... Log Out And Close Connection
1820
Test Setup Run Keyword
1921
... Restore Initial DUT Connection Method
2022

21-
Default Tags semiauto
22-
2323

2424
*** Test Cases ***
2525
OPN001.503 Install operating system on disk (OPNsense)
@@ -30,6 +30,7 @@ OPN001.503 Install operating system on disk (OPNsense)
3030
... modification.
3131
...
3232
... Previous IDs: OPN001.001
33+
[Tags] semiauto
3334
Power On
3435
Boot OPNsense Installer
3536
VAR ${installer_message}=
@@ -41,16 +42,13 @@ OPN001.503 Install operating system on disk (OPNsense)
4142

4243
OPN002.503 Boot operating system from disk (OPNsense)
4344
[Documentation] Boot OPNsense (serial output) from disk.
44-
... This test depends on semi-manual OS installation, thus it's
45-
... marked as semiauto.
45+
...
4646
... Previous IDs: OPN001.002
4747
Power On
4848
Boot OPNsense
4949

5050
OPN003.503 Boot operating system from disk after cold-boot (OPNsense)
5151
[Documentation] Boot OPNsense (serial output) from disk after cold-boot
52-
... This test depends on semi-manual OS installation, thus it's
53-
... marked as semiauto.
5452
...
5553
... Previous IDs: BOS001.001
5654
VAR @{supported_power_ctrls}= RteCtrl sonoff
@@ -64,8 +62,6 @@ OPN003.503 Boot operating system from disk after cold-boot (OPNsense)
6462

6563
OPN004.503 Boot operating system from disk after warm-boot (OPNsense)
6664
[Documentation] Boot OPNsense (serial output) from disk after warm-boot
67-
... This test depends on semi-manual OS installation, thus it's
68-
... marked as semiauto.
6965
...
7066
... Previous IDs: BOS002.001
7167
Power On
@@ -81,8 +77,6 @@ OPN004.503 Boot operating system from disk after warm-boot (OPNsense)
8177

8278
OPN005.503 Boot operating system from disk after reboot (OPNsense)
8379
[Documentation] Boot OPNsense (serial output) from disk after reboot
84-
... This test depends on semi-manual OS installation, thus it's
85-
... marked as semiauto.
8680
...
8781
... Previous IDs: BOS003.001
8882
Power On

‎dasharo-compatibility/os-pfsense.robot‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,21 @@ Resource ../keys.robot
1313
# Log Out And Close Connection - elementary teardown keyword for all tests.
1414
Suite Setup Run Keywords
1515
... Prepare Test Suite
16+
... AND
17+
... Skip If '${ENV_ID_PFSENSE}' not in ${TESTED_BSD_DISTROS} pfSense tests not supported
1618
Suite Teardown Run Keywords
1719
... Log Out And Close Connection
1820
Test Setup Run Keyword
1921
... Restore Initial DUT Connection Method
2022

21-
Default Tags semiauto
22-
2323

2424
*** Test Cases ***
2525
PFS001.502 Install operating system on disk (pfSense)
2626
[Documentation] Install pfSense LTS CE (serial output) from preseeded
2727
... USB stick on disk. Refer to test case PFS006.502 for preseed.
2828
...
2929
... Previous IDs: PFS001.001
30+
[Tags] semiauto
3031
Power On
3132
Boot PfSense Installer
3233
VAR ${installer_message}=
@@ -37,17 +38,13 @@ PFS001.502 Install operating system on disk (pfSense)
3738

3839
PFS002.502 Boot operating system from disk (pfSense)
3940
[Documentation] Boot pfSense LTS CE (serial output) from disk.
40-
... This test depends on semi-manual OS installation, thus it's
41-
... marked as semiauto.
4241
...
4342
... Previous IDs: PFS001.002
4443
Power On
4544
Boot PfSense
4645

4746
PFS003.502 Boot operating system from disk after cold-boot (pfSense)
4847
[Documentation] Boot pfSense LTS CE (serial output) from disk after cold-boot
49-
... This test depends on semi-manual OS installation, thus it's
50-
... marked as semiauto.
5148
...
5249
... Previous IDs: BPS001.001
5350
VAR @{supported_power_ctrls}= RteCtrl sonoff
@@ -61,8 +58,6 @@ PFS003.502 Boot operating system from disk after cold-boot (pfSense)
6158

6259
PFS004.502 Boot operating system from disk after warm-boot (pfSense)
6360
[Documentation] Boot pfSense LTS CE (serial output) from disk after warm-boot
64-
... This test depends on semi-manual OS installation, thus it's
65-
... marked as semiauto.
6661
...
6762
... Previous IDs: BPS002.001
6863
Power On
@@ -78,8 +73,6 @@ PFS004.502 Boot operating system from disk after warm-boot (pfSense)
7873

7974
PFS005.502 Boot operating system from disk after reboot (pfSense)
8075
[Documentation] Boot pfSense LTS CE (serial output) from disk after reboot
81-
... This test depends on semi-manual OS installation, thus it's
82-
... marked as semiauto.
8376
...
8477
... Previous IDs: BPS003.001
8578
Power On
@@ -97,6 +90,7 @@ PFS006.502 Preseed operating system installer (pfSense)
9790
... pfSense installer to PFEFI.
9891
... This test depends on semi-manual OS installatio media preparation,
9992
... thus it's marked as semiauto.
93+
[Tags] semiauto
10094
VAR ${pfefi_message}=
10195
... Rename ESP partition of pfSense
10296
... serial installer to PFEFI.\nOn Linux: (sudo) fatlabel /dev/sdX1
@@ -125,8 +119,6 @@ PFS006.502 Preseed operating system installer (pfSense)
125119

126120
PFS007.502 Boot operating system installer into rescue shell (pfSense)
127121
[Documentation] Boot installer into rescue shell.
128-
... This test depends on semi-manual OS installatio media preparation,
129-
... thus it's marked as semiauto.
130122
Power On
131123
Boot PfSense Installer
132124
Enter PfSense Rescue Shell

‎platform-configs/include/default.robot‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ ${DCU_SUPPORTED_BOOLEAN_SMMSTORE_VARIABLE}= NetworkBoot
322322
${WINDOWS_SHUTDOWN_AWAITING_SECONDS}= 120
323323

324324
@{TESTED_LINUX_DISTROS}= ${ENV_ID_UBUNTU}
325+
@{TESTED_BSD_DISTROS}= @{EMPTY}
325326
${DEFAULT_BOOT_OS_ID}= ${ENV_ID_UBUNTU}
326327
${BOOTED_OS_ID}= ${DEFAULT_BOOT_OS_ID}
327328

‎platform-configs/include/protectli-common.robot‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ ${TESTS_IN_UBUNTU_SUPPORT}= ${TRUE}
4343
${TESTS_IN_WINDOWS_SUPPORT}= ${TRUE}
4444
${TESTS_IN_ESXI_SUPPORT}= ${TRUE}
4545
${TESTS_IN_OPENWRT_SUPPORT}= ${TRUE}
46+
@{TESTED_BSD_DISTROS}= ${ENV_ID_PFSENSE} ${ENV_ID_OPNSENSE}
4647

4748
# Regression test flags
4849
${DASHARO_USB_MENU_SUPPORT}= ${TRUE}

0 commit comments

Comments
 (0)