test: Put all overrides into /etc/

RJ025 · Feb 16, 2023 · 3a4eece · 3a4eece
1 parent e2ff6b8
commit 3a4eece
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/test/verify/check-apps b/test/verify/check-apps
@@ -90,7 +90,7 @@ class TestApps(PackageCase):
         m.execute("rm -rf /usr/share/metainfo /usr/share/app-info /var/cache/app-info")
 
         # instead of the actual distro packages, use our own fake repo data package
-        m.write("/usr/share/cockpit/apps/override.json",
+        m.write("/etc/cockpit/apps.override.json",
                 '{ "config": { "appstream_data_packages": [ "appstream-data-test" ] } }')
 
         if urlroot != "":

diff --git a/test/verify/check-storage-nfs b/test/verify/check-storage-nfs
@@ -309,9 +309,8 @@ class TestStoragePackagesNFS(PackageCase, StorageCase, StorageHelpers):
         # Override configuration so that we don't have to remove the
         # real package.
 
-        self.machine.write("/usr/share/cockpit/storaged/override.json",
+        self.machine.write("/etc/cockpit/storaged.override.json",
                            """{ "config": { "nfs_client_package": "fake-nfs-utils" } }""")
-        self.addCleanup(self.machine.execute, "rm /usr/share/cockpit/storaged/override.json")
 
         if m.execute("if test -e /sbin/mount.nfs; then echo yes; fi").strip():
             m.execute("mv /sbin/mount.nfs /sbin/mount.nfs.off")

diff --git a/test/verify/check-storage-stratis b/test/verify/check-storage-stratis
@@ -385,7 +385,7 @@ class TestStoragePackagesStratis(PackageCase, StorageCase):
         b = self.browser
 
         m.execute("systemctl stop stratisd")
-        self.write_file("/usr/share/cockpit/storaged/override.json",
+        self.write_file("/etc/cockpit/storaged.override.json",
                         """{ "config": { "stratis_package": "fake-stratisd" } }""")
         self.createPackage("fake-stratisd", "999", "1")
         self.enableRepo()