xtask: Fix sorting stability for tests

Tests with equal numbers were getting unstable sorting, causing
the generated file to flap.

Signed-off-by: Colin Walters <walters@verbum.org>

Author: cgwalters

crates/xtask/src/tmt.rs

@@ -834,7 +834,7 @@ struct TmtMetadata {
     tmt: serde_yaml::Value,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Eq, PartialEq)]
 struct TestDef {
     number: u32,
     name: String,
@@ -845,6 +845,20 @@ struct TestDef {
     tmt: serde_yaml::Value,
 }
 
+impl Ord for TestDef {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.number
+            .cmp(&other.number)
+            .then_with(|| self.name.cmp(&other.name))
+    }
+}
+
+impl PartialOrd for TestDef {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
 /// Generate tmt/plans/integration.fmf from test definitions
 #[context("Updating TMT integration.fmf")]
 pub(crate) fn update_integration() -> Result<()> {
@@ -925,8 +939,7 @@ pub(crate) fn update_integration() -> Result<()> {
         });
     }
 
-    // Sort tests by number
-    tests.sort_by_key(|t| t.number);
+    tests.sort();
 
     // Generate single tests.fmf file using structured YAML
     let tests_dir = Utf8Path::new("tmt/tests");

tmt/plans/integration.fmf

@@ -71,19 +71,19 @@ execute:
     test:
       - /tmt/tests/tests/test-22-logically-bound-install
 
-/plan-23-usroverlay:
-  summary: Execute tests for bootc usrover
+/plan-23-install-outside-container:
+  summary: Execute tests for installing outside of a container
   discover:
     how: fmf
     test:
-      - /tmt/tests/tests/test-23-usroverlay
+      - /tmt/tests/tests/test-23-install-outside-container
 
-/plan-23-install-outside-container:
-  summary: Execute tests for installing outside of a container
+/plan-23-usroverlay:
+  summary: Execute tests for bootc usrover
   discover:
     how: fmf
     test:
-      - /tmt/tests/tests/test-23-install-outside-container
+      - /tmt/tests/tests/test-23-usroverlay
 
 /plan-24-image-upgrade-reboot:
   summary: Execute local upgrade tests

tmt/tests/tests.fmf

@@ -21,16 +21,16 @@
   duration: 30m
   test: nu booted/test-logically-bound-install.nu
 
-/test-23-usroverlay:
-  summary: Execute tests for bootc usrover
-  duration: 30m
-  test: nu booted/test-usroverlay.nu
-
 /test-23-install-outside-container:
   summary: Execute tests for installing outside of a container
   duration: 30m
   test: nu booted/test-install-outside-container.nu
 
+/test-23-usroverlay:
+  summary: Execute tests for bootc usrover
+  duration: 30m
+  test: nu booted/test-usroverlay.nu
+
 /test-24-image-upgrade-reboot:
   summary: Execute local upgrade tests
   duration: 30m