From d502157d7e0576f4cfa5ffec51352b7682ed26f1 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Tue, 30 Nov 2021 16:36:10 +0000
Subject: [PATCH] test/stages: ensure we always have a `tree`

Ensure that all our stage tests always have at least one stage,
even it is just a `noop` stage, so that we can checkpoint and
export the `tree`.
---
 test/data/stages/first-boot/a.json    | 8 +++++++-
 test/data/stages/first-boot/diff.json | 9 +--------
 test/data/stages/grub2/a.json         | 6 +++++-
 test/data/stages/grub2/a.mpp.json     | 6 +++++-
 test/data/stages/grub2/diff.json      | 9 +--------
 test/data/stages/gzip/a.json          | 6 +++++-
 test/data/stages/gzip/a.mpp.json      | 6 +++++-
 test/data/stages/gzip/diff.json       | 9 +--------
 test/data/stages/nm.conf/a.json       | 6 +++++-
 test/data/stages/nm.conf/a.mpp.json   | 6 +++++-
 test/data/stages/nm.conf/diff.json    | 9 +--------
 test/data/stages/nm.conn/a.json       | 6 +++++-
 test/data/stages/nm.conn/a.mpp.json   | 6 +++++-
 test/data/stages/nm.conn/diff.json    | 9 +--------
 test/data/stages/rpm/a.json           | 8 +++++++-
 test/data/stages/rpm/diff.json        | 9 +--------
 test/data/stages/untar/a.json         | 6 +++++-
 test/data/stages/untar/a.mpp.json     | 6 +++++-
 test/data/stages/untar/diff.json      | 9 +--------
 test/data/stages/xz/a.json            | 6 +++++-
 test/data/stages/xz/a.mpp.json        | 6 +++++-
 test/data/stages/xz/diff.json         | 9 +--------
 22 files changed, 82 insertions(+), 78 deletions(-)

diff --git a/test/data/stages/first-boot/a.json b/test/data/stages/first-boot/a.json
index 6d256b23..f6b81a54 100644
--- a/test/data/stages/first-boot/a.json
+++ b/test/data/stages/first-boot/a.json
@@ -1,4 +1,10 @@
 {
   "sources": {},
-  "pipeline": {}
+  "pipeline": {
+    "stages": [
+      {
+        "name": "org.osbuild.noop"
+      }
+    ]
+  }
 }
diff --git a/test/data/stages/first-boot/diff.json b/test/data/stages/first-boot/diff.json
index ab5103ca..691fe01a 100644
--- a/test/data/stages/first-boot/diff.json
+++ b/test/data/stages/first-boot/diff.json
@@ -11,12 +11,5 @@
     "/usr/lib/systemd/system/osbuild-first-boot.service"
   ],
   "deleted_files": [],
-  "differences": {
-    "/": {
-      "mode": [
-        16832,
-        16877
-      ]
-    }
-  }
+  "differences": {}
 }
diff --git a/test/data/stages/grub2/a.json b/test/data/stages/grub2/a.json
index b0bedbb4..1697fa7a 100644
--- a/test/data/stages/grub2/a.json
+++ b/test/data/stages/grub2/a.json
@@ -345,7 +345,11 @@
     {
       "name": "tree",
       "build": "name:build",
-      "stages": []
+      "stages": [
+        {
+          "type": "org.osbuild.noop"
+        }
+      ]
     }
   ],
   "sources": {
diff --git a/test/data/stages/grub2/a.mpp.json b/test/data/stages/grub2/a.mpp.json
index 5e0d70f6..ca5db5e9 100644
--- a/test/data/stages/grub2/a.mpp.json
+++ b/test/data/stages/grub2/a.mpp.json
@@ -11,7 +11,11 @@
     {
       "name": "tree",
       "build": "name:build",
-      "stages": []
+      "stages": [
+        {
+          "type": "org.osbuild.noop"
+        }
+      ]
     }
   ]
 }
diff --git a/test/data/stages/grub2/diff.json b/test/data/stages/grub2/diff.json
index 2401ebc5..c37db101 100644
--- a/test/data/stages/grub2/diff.json
+++ b/test/data/stages/grub2/diff.json
@@ -31,12 +31,5 @@
     "/etc/default/grub"
   ],
   "deleted_files": [],
-  "differences": {
-    "/": {
-      "mode": [
-        16832,
-        16877
-      ]
-    }
-  }
+  "differences": {}
 }
diff --git a/test/data/stages/gzip/a.json b/test/data/stages/gzip/a.json
index b0bedbb4..1697fa7a 100644
--- a/test/data/stages/gzip/a.json
+++ b/test/data/stages/gzip/a.json
@@ -345,7 +345,11 @@
     {
       "name": "tree",
       "build": "name:build",
-      "stages": []
+      "stages": [
+        {
+          "type": "org.osbuild.noop"
+        }
+      ]
     }
   ],
   "sources": {
diff --git a/test/data/stages/gzip/a.mpp.json b/test/data/stages/gzip/a.mpp.json
index 5e0d70f6..ca5db5e9 100644
--- a/test/data/stages/gzip/a.mpp.json
+++ b/test/data/stages/gzip/a.mpp.json
@@ -11,7 +11,11 @@
     {
       "name": "tree",
       "build": "name:build",
-      "stages": []
+      "stages": [
+        {
+          "type": "org.osbuild.noop"
+        }
+      ]
     }
   ]
 }
diff --git a/test/data/stages/gzip/diff.json b/test/data/stages/gzip/diff.json
index ba1d0174..427eccc8 100644
--- a/test/data/stages/gzip/diff.json
+++ b/test/data/stages/gzip/diff.json
@@ -3,12 +3,5 @@
     "/compressed.gz"
   ],
   "deleted_files": [],
-  "differences": {
-    "/": {
-      "mode": [
-        16832,
-        16877
-      ]
-    }
-  }
+  "differences": {}
 }
diff --git a/test/data/stages/nm.conf/a.json b/test/data/stages/nm.conf/a.json
index 5fef648e..9cae8269 100644
--- a/test/data/stages/nm.conf/a.json
+++ b/test/data/stages/nm.conf/a.json
@@ -270,7 +270,11 @@
         ]
       }
     },
-    "stages": []
+    "stages": [
+      {
+        "name": "org.osbuild.noop"
+      }
+    ]
   },
   "sources": {
     "org.osbuild.files": {
diff --git a/test/data/stages/nm.conf/a.mpp.json b/test/data/stages/nm.conf/a.mpp.json
index 73c0df7b..f563eefd 100644
--- a/test/data/stages/nm.conf/a.mpp.json
+++ b/test/data/stages/nm.conf/a.mpp.json
@@ -6,6 +6,10 @@
       },
       "runner": "org.osbuild.fedora34"
     },
-    "stages": []
+    "stages": [
+      {
+        "name": "org.osbuild.noop"
+      }
+    ]
   }
 }
diff --git a/test/data/stages/nm.conf/diff.json b/test/data/stages/nm.conf/diff.json
index 06fe2901..13c70c70 100644
--- a/test/data/stages/nm.conf/diff.json
+++ b/test/data/stages/nm.conf/diff.json
@@ -7,12 +7,5 @@
     "/etc/NetworkManager/conf.d/99-unmanaged-devices.conf"
   ],
   "deleted_files": [],
-  "differences": {
-    "/": {
-      "mode": [
-        16832,
-        16877
-      ]
-    }
-  }
+  "differences": {}
 }
diff --git a/test/data/stages/nm.conn/a.json b/test/data/stages/nm.conn/a.json
index 5fef648e..9cae8269 100644
--- a/test/data/stages/nm.conn/a.json
+++ b/test/data/stages/nm.conn/a.json
@@ -270,7 +270,11 @@
         ]
       }
     },
-    "stages": []
+    "stages": [
+      {
+        "name": "org.osbuild.noop"
+      }
+    ]
   },
   "sources": {
     "org.osbuild.files": {
diff --git a/test/data/stages/nm.conn/a.mpp.json b/test/data/stages/nm.conn/a.mpp.json
index 73c0df7b..f563eefd 100644
--- a/test/data/stages/nm.conn/a.mpp.json
+++ b/test/data/stages/nm.conn/a.mpp.json
@@ -6,6 +6,10 @@
       },
       "runner": "org.osbuild.fedora34"
     },
-    "stages": []
+    "stages": [
+      {
+        "name": "org.osbuild.noop"
+      }
+    ]
   }
 }
diff --git a/test/data/stages/nm.conn/diff.json b/test/data/stages/nm.conn/diff.json
index 5d82aab4..c23700f8 100644
--- a/test/data/stages/nm.conn/diff.json
+++ b/test/data/stages/nm.conn/diff.json
@@ -11,12 +11,5 @@
     "/usr/lib/NetworkManager/system-connections/osbuild.nmconnection"
   ],
   "deleted_files": [],
-  "differences": {
-    "/": {
-      "mode": [
-        16832,
-        16877
-      ]
-    }
-  }
+  "differences": {}
 }
diff --git a/test/data/stages/rpm/a.json b/test/data/stages/rpm/a.json
index 6d256b23..f6b81a54 100644
--- a/test/data/stages/rpm/a.json
+++ b/test/data/stages/rpm/a.json
@@ -1,4 +1,10 @@
 {
   "sources": {},
-  "pipeline": {}
+  "pipeline": {
+    "stages": [
+      {
+        "name": "org.osbuild.noop"
+      }
+    ]
+  }
 }
diff --git a/test/data/stages/rpm/diff.json b/test/data/stages/rpm/diff.json
index 83f07956..eec08edd 100644
--- a/test/data/stages/rpm/diff.json
+++ b/test/data/stages/rpm/diff.json
@@ -269,12 +269,5 @@
     "/proc"
   ],
   "deleted_files": [],
-  "differences": {
-    "/": {
-      "mode": [
-        16832,
-        16877
-      ]
-    }
-  }
+  "differences": {}
 }
diff --git a/test/data/stages/untar/a.json b/test/data/stages/untar/a.json
index b0bedbb4..1697fa7a 100644
--- a/test/data/stages/untar/a.json
+++ b/test/data/stages/untar/a.json
@@ -345,7 +345,11 @@
     {
       "name": "tree",
       "build": "name:build",
-      "stages": []
+      "stages": [
+        {
+          "type": "org.osbuild.noop"
+        }
+      ]
     }
   ],
   "sources": {
diff --git a/test/data/stages/untar/a.mpp.json b/test/data/stages/untar/a.mpp.json
index 5e0d70f6..ca5db5e9 100644
--- a/test/data/stages/untar/a.mpp.json
+++ b/test/data/stages/untar/a.mpp.json
@@ -11,7 +11,11 @@
     {
       "name": "tree",
       "build": "name:build",
-      "stages": []
+      "stages": [
+        {
+          "type": "org.osbuild.noop"
+        }
+      ]
     }
   ]
 }
diff --git a/test/data/stages/untar/diff.json b/test/data/stages/untar/diff.json
index 77c0dfe8..e51fc34a 100644
--- a/test/data/stages/untar/diff.json
+++ b/test/data/stages/untar/diff.json
@@ -7,12 +7,5 @@
     "/test/hello/world.txt"
   ],
   "deleted_files": [],
-  "differences": {
-    "/": {
-      "mode": [
-        16832,
-        16877
-      ]
-    }
-  }
+  "differences": {}
 }
diff --git a/test/data/stages/xz/a.json b/test/data/stages/xz/a.json
index b0bedbb4..1697fa7a 100644
--- a/test/data/stages/xz/a.json
+++ b/test/data/stages/xz/a.json
@@ -345,7 +345,11 @@
     {
       "name": "tree",
       "build": "name:build",
-      "stages": []
+      "stages": [
+        {
+          "type": "org.osbuild.noop"
+        }
+      ]
     }
   ],
   "sources": {
diff --git a/test/data/stages/xz/a.mpp.json b/test/data/stages/xz/a.mpp.json
index 5e0d70f6..ca5db5e9 100644
--- a/test/data/stages/xz/a.mpp.json
+++ b/test/data/stages/xz/a.mpp.json
@@ -11,7 +11,11 @@
     {
       "name": "tree",
       "build": "name:build",
-      "stages": []
+      "stages": [
+        {
+          "type": "org.osbuild.noop"
+        }
+      ]
     }
   ]
 }
diff --git a/test/data/stages/xz/diff.json b/test/data/stages/xz/diff.json
index 2c3e95b2..9ec2c196 100644
--- a/test/data/stages/xz/diff.json
+++ b/test/data/stages/xz/diff.json
@@ -3,12 +3,5 @@
     "/compressed.xz"
   ],
   "deleted_files": [],
-  "differences": {
-    "/": {
-      "mode": [
-        16832,
-        16877
-      ]
-    }
-  }
+  "differences": {}
 }