Merge pull request #1135 from kernelkit/test-fixes

Test fixes

Signed-off-by: Joachim Wiberg <[email protected]>

Author: troglobit

.github/workflows/test.yml

@@ -39,7 +39,7 @@ env:
 jobs:
   test:
     name: Regression Test ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.name || inputs.name }} ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target || inputs.target }}
-    runs-on: [ self-hosted, regression ]
+    runs-on: [self-hosted, regression]
     steps:
       - name: Checkout infix repo
         uses: actions/checkout@v4
@@ -87,7 +87,7 @@ jobs:
           fi
           make test
 
-      - name: Publish Test Result for ${{ env.TARGET }} 
+      - name: Publish Test Result for ${{ env.TARGET }}
         # Ensure this runs even if Regression Test fails
         if: always()
         run: cat $TEST_PATH/.log/last/result-gh.md >> $GITHUB_STEP_SUMMARY
@@ -96,15 +96,10 @@ jobs:
         # Ensure this runs even if Regression Test fails
         if: always()
         run: |
-          asciidoctor-pdf \
-          --theme $TEST_PATH/9pm/report/theme.yml \
-          -a pdf-fontsdir=$TEST_PATH/9pm/report/fonts \
-          $TEST_PATH/.log/last/report.adoc \
-          -o $TEST_PATH/.log/last/report.pdf
+          make test-dir="$(pwd)/$TEST_PATH" test-report
 
       - name: Upload Test Report as Artifact
         uses: actions/upload-artifact@v4
         with:
           name: test-report
-          path: ${{ env.TEST_PATH }}/.log/last/report.pdf
-
+          path: output/images/test-report.pdf

board/common/mkdisk.sh

@@ -83,7 +83,7 @@ genboot()
 {
     if [ -d "$bootdata" ]; then
 	bootimg=$(cat <<EOF
-image efi-part.vfat {
+image $BINARIES_DIR/efi-part.vfat {
 	size = $bootsize
 	vfat {
 		file EFI {
@@ -98,7 +98,7 @@ EOF
 		offset = $bootoffs
 		partition-type-uuid = U
 		bootable = true
-		image = efi-part.vfat
+		image = $BINARIES_DIR/efi-part.vfat
 	}
 EOF
 		  )

test/9pm

@@ -14,38 +14,37 @@
   infamy:
     specification: False
 
-
 - name: Misc tests
-  suite: misc/misc.yaml
-
-- name:  ietf-system
-  suite: ietf_system/ietf_system.yaml
+  suite: misc/all.yaml
 
 # Upgrade may leave wrong boot order
 - case: meta/bootorder.py
   infamy:
     specification: False
 
-- name:  ietf-syslog
-  suite: ietf_syslog/ietf_syslog.yaml
+- name: "IETF System"
+  suite: ietf_system/all.yaml
+
+- name: "IETF Syslog"
+  suite: ietf_syslog/all.yaml
 
-- name:  ietf-interfaces
-  suite: ietf_interfaces/ietf_interfaces.yaml
+- name: "IETF Interfaces"
+  suite: ietf_interfaces/all.yaml
 
-- name:  ietf-routing
-  suite: ietf_routing/ietf_routing.yaml
+- name: "IETF Routing"
+  suite: ietf_routing/all.yaml
 
-- name:  infix-containers
-  suite: infix_containers/infix_containers.yaml
+- name: "Infix Containers"
+  suite: infix_containers/all.yaml
 
-- name:  infix-dhcp
-  suite: infix_dhcp/infix_dhcp.yaml
+- name: "Infix DHCP"
+  suite: infix_dhcp/all.yaml
 
-- name:  ietf-hardware
-  suite: ietf_hardware/ietf_hardware.yaml
+- name: "IETF Hardware"
+  suite: ietf_hardware/all.yaml
 
-- name:  infix-services
-  suite: infix_services/infix_services.yaml
+- name: "Infix Services"
+  suite: infix_services/all.yaml
 
-- name: use-cases
-  suite: use_case/use_case.yml
+- name: "Use Case Tests"
+  suite: use_case/all.yaml

test/case/all.yaml

@@ -1,7 +1,10 @@
 :testgroup:
 == ietf-hardware
 
-<<<
+Tests verifying IETF standard hardware monitoring and management:
+
+ - USB device detection and enumeration
+ - Multiple USB port management and device handling
 
 include::usb/Readme.adoc[]
 

test/case/ietf_hardware/Readme.adoc

@@ -0,0 +1,6 @@
+---
+- name: USB configuration
+  case: usb/test.py
+
+- name: USB configuration with two USB ports
+  case: usb_two_ports/test.py

test/case/ietf_hardware/all.yaml

@@ -1 +1 @@
-usb.adoc
+test.adoc

test/case/ietf_hardware/ietf_hardware.yaml

@@ -1,5 +1,9 @@
 === USB configuration
+
+ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_hardware/usb]
+
 ==== Description
+
 This test checks if the configuration is consistent with hardware state,
 and verifies whether the USB ports are correctly _locked_ (restricted from
 use) and _unlocked_ (available for use) when they should. It also verifies
@@ -11,18 +15,11 @@ If this pass you can be certain that the configuration of the USB
 port is handled correctly.
 
 ==== Topology
-ifdef::topdoc[]
-image::{topdoc}../../test/case/ietf_hardware/usb/topology.svg[USB configuration topology]
-endif::topdoc[]
-ifndef::topdoc[]
-ifdef::testgroup[]
-image::usb/topology.svg[USB configuration topology]
-endif::testgroup[]
-ifndef::testgroup[]
-image::topology.svg[USB configuration topology]
-endif::testgroup[]
-endif::topdoc[]
-==== Test sequence
+
+image::topology.svg[USB configuration topology, align=center, scaledwidth=75%]
+
+==== Sequence
+
 . Set up topology and attach to target DUT
 . Unlock all USB ports
 . Verify that all USB ports are unlocked
@@ -36,5 +33,3 @@ endif::topdoc[]
 . Verify USB port remain unlocked after reboot
 
 
-<<<
-

test/case/ietf_hardware/usb/Readme.adoc

@@ -1 +1 @@
-usb_two_ports.adoc
+test.adoc