Merge pull request #3447 from mulkieran/tmt-test

Use Packit/TMT to run Python-based udev tests

.fmf/version

@@ -0,0 +1 @@
+1

.github/workflows/support.yml

@@ -45,8 +45,8 @@ jobs:
           - dependencies: black python3-isort
             task: make -f Makefile fmt-ci
             working-directory: ./tests/client-dbus
-          - dependencies: yamllint
-            task: make -f Makefile yamllint
+          - dependencies: yamllint tmt
+            task: make -f Makefile yamllint tmtlint
             working-directory: .
     runs-on: ubuntu-22.04
     container: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT

.github/workflows/weekly.yml

@@ -29,8 +29,8 @@ jobs:
           - dependencies: black python3-isort
             task: make -f Makefile fmt-ci
             working-directory: ./tests/client-dbus
-          - dependencies: yamllint
-            task: make -f Makefile yamllint
+          - dependencies: yamllint tmt
+            task: make -f Makefile yamllint tmtlint
             working-directory: .
           - dependencies: shfmt
             task: make -f Makefile fmt-shell-ci

.packit.yaml

@@ -29,6 +29,10 @@ srpm_build_deps:
 jobs:
     - job: copr_build
       trigger: pull_request
-      manual_trigger: true
+      targets:
+          - fedora-stable
+
+    - job: tests
+      trigger: pull_request
       targets:
           - fedora-stable

Makefile

@@ -425,6 +425,10 @@ test-stratis-min:
 yamllint:
 	yamllint --strict .github/workflows/*.yml .packit.yaml
 
+## Run tmt lint
+tmtlint:
+	tmt lint
+
 ## Build docs-rust for CI
 docs-ci: docs-rust
 
@@ -507,6 +511,7 @@ clippy: clippy-macros clippy-min clippy-udev-utils clippy-no-ipc
 	test-clevis-loop-should-fail-valgrind
 	test-clevis-real
 	test-clevis-real-should-fail
+	tmtlint
 	yamllint
 
 # COLORS

plans/all.fmf

@@ -0,0 +1,18 @@
+summary: top level management
+prepare:
+  - name: Install packages
+    how: install
+    package:
+     - tang
+     - systemd
+  - name: Start tang server
+    how: shell
+    script: systemctl enable tangd.socket --now
+  - name: Reload udev
+    how: shell
+    script: udevadm control --reload
+discover:
+  how: fmf
+execute:
+  how: tmt
+  exit-first: false

test/loop/main.fmf

@@ -0,0 +1,12 @@
+summary: Run tests that use loopbacked device framework
+duration: 20m
+require:
+  - clevis-luks
+  - make
+  - python3-dbus
+  - python3-dbus-client-gen
+  - python3-dbus-python-client-gen
+  - python3-psutil
+  - python3-pyudev
+test: TANG_URL=localhost RUST_LOG=stratisd=debug STRATISD=/usr/libexec/stratisd STRATIS_DUMPMETADATA=/usr/bin/stratis-dumpmetadata PYTHONPATH=./src make -f Makefile tang-tests dump-metadata-tests
+path: /tests/client-dbus

test/udev/main.fmf

@@ -0,0 +1,12 @@
+summary: Run udev tests
+duration: 20m
+require:
+  - clevis-luks
+  - make
+  - python3-dbus
+  - python3-dbus-client-gen
+  - python3-dbus-python-client-gen
+  - python3-psutil
+  - python3-pyudev
+test: TANG_URL=localhost RUST_LOG=stratisd=debug STRATISD=/usr/libexec/stratisd STRATIS_DUMPMETADATA=/usr/bin/stratis-dumpmetadata PYTHONPATH=./src make -f Makefile udev-tests
+path: /tests/client-dbus

tests/client-dbus/tests/udev/_loopback.py

@@ -97,11 +97,21 @@ def create_devices(self, number):
         Note: The first time a loop back device is known it will generate
         a udev "add" event, subsequent backing file changes do not, thus we
         will need to generate it synthetically.
+
+        If this is the absolute first time calling losetup for this sequence,
+        make an extra loop device and skip the first loop device created.
+
         :param int number: the number of devices to create
         :return: list of keys for the devices
         :rtype: list of uuid.UUID
         """
         tokens = []
+
+        first_creation = self.count == 0
+
+        if first_creation:
+            number = number + 1
+
         for _ in range(number):
             backing_file = os.path.join(self.dir, f"block_device_{self.count}")
             self.count += 1
@@ -119,6 +129,9 @@ def create_devices(self, number):
             self.devices[token] = (device, backing_file)
             tokens.append(token)
 
+        if first_creation:
+            tokens = tokens[1:]
+
         self._wait_for_udev(tokens)
         self.generate_synthetic_udev_events(tokens, UDEV_ADD_EVENT)
         return tokens