Merge pull request #330 from mvo5/less-cruft-2

test: remove `test/aptroot` usage
mvo5 · Aug 5, 2022 · 5f979a2 · 5f979a2
2 parents 244baa2 + a1493c0
commit 5f979a2
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@
 /build/
 /test/.coverage
 /test/.mypy_cache/
-/test/aptroot/var/cache/
 /test/packages/test-package*.deb
 /test/u-u.lock
 __pycache__/

diff --git a/.../etc/apt/apt.conf.d/50unattended-upgrades → .../etc/apt/apt.conf.d/50unattended-upgrades b/.../etc/apt/apt.conf.d/50unattended-upgrades → .../etc/apt/apt.conf.d/50unattended-upgrades
diff --git a/test/aptroot/etc/apt/sources.list → ...t.minimal-partitions/etc/apt/sources.list b/test/aptroot/etc/apt/sources.list → ...t.minimal-partitions/etc/apt/sources.list
diff --git a/test/aptroot/etc/apt/trusted.gpg → ...ot.minimal-partitions/etc/apt/trusted.gpg b/test/aptroot/etc/apt/trusted.gpg → ...ot.minimal-partitions/etc/apt/trusted.gpg
diff --git a/test/aptroot/usr/bin/dpkg → test/root.minimal-partitions/usr/bin/dpkg b/test/aptroot/usr/bin/dpkg → test/root.minimal-partitions/usr/bin/dpkg
diff --git a/test/aptroot/var/lib/dpkg/status → ...ot.minimal-partitions/var/lib/dpkg/status b/test/aptroot/var/lib/dpkg/status → ...ot.minimal-partitions/var/lib/dpkg/status
diff --git a/test/aptroot/var/lib/dpkg/updates/.gitignore → ...artitions/var/lib/dpkg/updates/.gitignore b/test/aptroot/var/lib/dpkg/updates/.gitignore → ...artitions/var/lib/dpkg/updates/.gitignore
diff --git a/test/test_base.py b/test/test_base.py
@@ -47,10 +47,6 @@ def setUp(self):
         # reset apt config
         apt.apt_pkg.init_config()
         apt.apt_pkg.config.set("APT::Architecture", "amd64")
-        # FIXME: would be nice to only set this if needed
-        apt.apt_pkg.config.set(
-            "Dir", os.path.join(os.path.dirname(__file__), "aptroot"))
-        apt.apt_pkg.init_system()
         # must be last
         self._saved_apt_conf = {}
         for k in apt.apt_pkg.config.keys():
@@ -93,6 +89,7 @@ def make_fake_aptroot(self, template=None, fake_pkgs=[]):
         apt.apt_pkg.config.set("Dir::State::status", mock_dpkg_status)
         apt.apt_pkg.config.clear("DPkg::Pre-Invoke")
         apt.apt_pkg.config.clear("DPkg::Post-Invoke")
+        apt.apt_pkg.config.clear("DPkg::Pre-Install-Pkgs")
         apt.apt_pkg.config.set("Debug::NoLocking", "true")
         # we don't really run dpkg
         fake_dpkg = os.path.join(aptroot, "usr", "bin", "dpkg")

diff --git a/test/test_minimal_partitions.py b/test/test_minimal_partitions.py
@@ -34,16 +34,8 @@ class TestMinimalPartitions(TestBase):
 
     def setUp(self):
         TestBase.setUp(self)
-        # setup dry-run mode for apt
-        apt_pkg.config.set("Debug::NoLocking", "1")
-        # apt_pkg.config.set("Debug::pkgDPkgPM", "1")
-        apt_pkg.config.set(
-            "Dir::State::extended_states",
-            os.path.join(self.tempdir, "extended_states"))
-        self.addCleanup(apt_pkg.config.clear, "Dir::state::extended_states")
-        apt_pkg.config.clear("Dpkg::Post-Invoke")
-        apt_pkg.config.clear("Dpkg::Pre-Install-Pkgs")
-        rootdir = os.path.join(self.testdir, "aptroot")
+        rootdir = self.make_fake_aptroot(
+            template=os.path.join(os.path.dirname(__file__), "root.minimal-partitions"))
         self.cache = apt.Cache(rootdir=rootdir)
         # mock LogDir config
         self.u_u_logdir = apt_pkg.config.get("Unattended-Upgrade::LogDir")