Merge lp:~bjornt/landscape-client/apt-facade-test-helpers into lp:~landscape/landscape-client/trunk

[Björn Tillenius]

Factor out methods that modify Apt Packages files, since we already had
similar methods in two TestCases and we'll be needed the same methods of
the package changer tests as well.

[Alberto Donato (ack)]

Good, +1!

review: Approve

[Thomas Herve (therve)]

+1!

review: Approve

=== modified file 'landscape/package/tests/helpers.py'
--- landscape/package/tests/helpers.py	2011-10-26 12:55:00 +0000
+++ landscape/package/tests/helpers.py	2011-11-09 09:43:23 +0000
@@ -1,9 +1,14 @@
 import base64
 import os
+import textwrap
+import time
 
 import smart
 
-from landscape.lib.fs import create_file
+import apt_inst
+import apt_pkg
+
+from landscape.lib.fs import append_file, create_file
 from landscape.package.facade import AptFacade
 
 
@@ -12,10 +17,82 @@
 
     def set_up(self, test_case):
         test_case.apt_root = test_case.makeDir()
-        test_case.dpkg_status = os.path.join(
+        self.dpkg_status = os.path.join(
             test_case.apt_root, "var", "lib", "dpkg", "status")
         test_case.facade = AptFacade(root=test_case.apt_root)
         test_case.facade.refetch_package_index = True
+        test_case._add_system_package = self._add_system_package
+        test_case._install_deb_file = self._install_deb_file
+        test_case._add_package_to_deb_dir = self._add_package_to_deb_dir
+        test_case._touch_packages_file = self._touch_packages_file
+
+    def _add_package(self, packages_file, name, architecture="all",
+                     version="1.0", control_fields=None):
+        if control_fields is None:
+            control_fields = {}
+        package_stanza = textwrap.dedent("""
+                Package: %(name)s
+                Priority: optional
+                Section: misc
+                Installed-Size: 1234
+                Maintainer: Someone
+                Architecture: %(architecture)s
+                Source: source
+                Version: %(version)s
+                Config-Version: 1.0
+                Description: description
+                """ % {"name": name, "version": version,
+                       "architecture": architecture})
+        package_stanza = apt_pkg.rewrite_section(
+            apt_pkg.TagSection(package_stanza), apt_pkg.REWRITE_PACKAGE_ORDER,
+            control_fields.items())
+        append_file(packages_file, "\n" + package_stanza + "\n")
+
+    def _add_system_package(self, name, architecture="all", version="1.0",
+                            control_fields=None):
+        """Add a package to the dpkg status file."""
+        system_control_fields = {"Status": "install ok installed"}
+        if control_fields is not None:
+            system_control_fields.update(control_fields)
+        self._add_package(
+            self.dpkg_status, name, architecture=architecture, version=version,
+            control_fields=system_control_fields)
+
+    def _install_deb_file(self, path):
+        """Fake the the given deb file is installed in the system."""
+        deb_file = open(path)
+        deb = apt_inst.DebFile(deb_file)
+        control = deb.control.extractdata("control")
+        deb_file.close()
+        lines = control.splitlines()
+        lines.insert(1, "Status: install ok installed")
+        status = "\n".join(lines)
+        append_file(self.dpkg_status, status + "\n\n")
+
+    def _add_package_to_deb_dir(self, path, name, version="1.0",
+                                control_fields=None):
+        """Add fake package information to a directory.
+
+        There will only be basic information about the package
+        available, so that get_packages() have something to return.
+        There won't be an actual package in the dir.
+        """
+        if control_fields is None:
+            control_fields = {}
+        self._add_package(
+            os.path.join(path, "Packages"), name, version=version,
+            control_fields=control_fields)
+
+    def _touch_packages_file(self, deb_dir):
+        """Make sure the Packages file get a newer mtime value.
+
+        If we rely on simply writing to the file to update the mtime, we
+        might end up with the same as before, since the resolution is
+        seconds, which causes apt to not reload the file.
+        """
+        packages_path = os.path.join(deb_dir, "Packages")
+        mtime = int(time.time() + 1)
+        os.utime(packages_path, (mtime, mtime))
 
 
 class SimpleRepositoryHelper(object):

=== modified file 'landscape/package/tests/test_facade.py'
--- landscape/package/tests/test_facade.py	2011-11-09 09:43:23 +0000
+++ landscape/package/tests/test_facade.py	2011-11-09 09:43:23 +0000
@@ -8,7 +8,6 @@
 from smart.cache import Provides
 from smart.const import NEVER, ALWAYS
 
-import apt_inst
 import apt_pkg
 from aptsources.sourceslist import SourcesList
 
@@ -18,7 +17,7 @@
 
 import smart
 
-from landscape.lib.fs import append_file, read_file
+from landscape.lib.fs import read_file
 from landscape.package.facade import (
     TransactionError, DependencyError, ChannelError, SmartError, AptFacade)
 
@@ -35,74 +34,6 @@
 
     helpers = [AptFacadeHelper]
 
-    def _add_package(self, packages_file, name, architecture="all",
-                     version="1.0", control_fields=None):
-        if control_fields is None:
-            control_fields = {}
-        package_stanza = textwrap.dedent("""
-                Package: %(name)s
-                Priority: optional
-                Section: misc
-                Installed-Size: 1234
-                Maintainer: Someone
-                Architecture: %(architecture)s
-                Source: source
-                Version: %(version)s
-                Config-Version: 1.0
-                Description: description
-                """ % {"name": name, "version": version,
-                       "architecture": architecture})
-        package_stanza = apt_pkg.rewrite_section(
-            apt_pkg.TagSection(package_stanza), apt_pkg.REWRITE_PACKAGE_ORDER,
-            control_fields.items())
-        append_file(packages_file, package_stanza + "\n")
-
-    def _add_system_package(self, name, architecture="all", version="1.0",
-                            control_fields=None):
-        """Add a package to the dpkg status file."""
-        system_control_fields = {"Status": "install ok installed"}
-        if control_fields is not None:
-            system_control_fields.update(control_fields)
-        self._add_package(
-            self.dpkg_status, name, architecture=architecture, version=version,
-            control_fields=system_control_fields)
-
-    def _install_deb_file(self, path):
-        """Fake the the given deb file is installed in the system."""
-        deb_file = open(path)
-        deb = apt_inst.DebFile(deb_file)
-        control = deb.control.extractdata("control")
-        deb_file.close()
-        lines = control.splitlines()
-        lines.insert(1, "Status: install ok installed")
-        status = "\n".join(lines)
-        append_file(self.dpkg_status, status + "\n\n")
-
-    def _add_package_to_deb_dir(self, path, name, version="1.0",
-                                control_fields=None):
-        """Add fake package information to a directory.
-
-        There will only be basic information about the package
-        available, so that get_packages() have something to return.
-        There won't be an actual package in the dir.
-        """
-        if control_fields is None:
-            control_fields = {}
-        self._add_package(
-            os.path.join(path, "Packages"), name, version=version,
-            control_fields=control_fields)
-
-    def _touch_packages_file(self, deb_dir):
-        """Make sure the Packages file get a newer mtime value.
-
-        If we rely on simply writing to the file to update the mtime, we
-        might end up with the same as before, since the resolution is
-        seconds, which causes apt to not reload the file.
-        """
-        packages_path = os.path.join(deb_dir, "Packages")
-        mtime = int(time.time() + 1)
-        os.utime(packages_path, (mtime, mtime))
-
     def test_default_root(self):
         """
         C{AptFacade} can be created by not providing a root directory,

=== modified file 'landscape/package/tests/test_reporter.py'
--- landscape/package/tests/test_reporter.py	2011-11-08 10:54:08 +0000
+++ landscape/package/tests/test_reporter.py	2011-11-09 09:43:23 +0000
@@ -2,15 +2,13 @@
 import sys
 import os
 import unittest
-import textwrap
 import time
 
 from twisted.internet.defer import Deferred, succeed
 from twisted.internet import reactor
 
-import apt_inst
 
-from landscape.lib.fs import append_file, create_file
+from landscape.lib.fs import create_file
 from landscape.lib.fetch import fetch_async, FetchError
 from landscape.lib import bpickle
 from landscape.package.store import (
@@ -1639,41 +1637,6 @@
         result = super(PackageReporterAptTest, self).setUp()
         return result.addCallback(set_up)
 
-    def _install_deb_file(self, path):
-        """Fake the the given deb file is installed in the system."""
-        deb_file = open(path)
-        deb = apt_inst.DebFile(deb_file)
-        control = deb.control.extractdata("control")
-        deb_file.close()
-        lines = control.splitlines()
-        lines.insert(1, "Status: install ok installed")
-        status = "\n".join(lines)
-        append_file(self.dpkg_status, status + "\n\n")
-
-    def _add_package_to_deb_dir(self, path, name, version="1.0"):
-        """Add fake package information to a directory.
-
-        There will only be basic information about the package
-        available, so that get_packages() have something to return.
-        There won't be an actual package in the dir.
-        """
-        package_stanza = textwrap.dedent("""
-                Package: %(name)s
-                Priority: optional
-                Section: misc
-                Installed-Size: 1234
-                Maintainer: Someone
-                Architecture: all
-                Source: source
-                Version: %(version)s
-                Config-Version: 1.0
-                Description: description
-
-                """)
-        append_file(
-            os.path.join(path, "Packages"),
-            package_stanza % {"name": name, "version": version})
-
     def _clear_repository(self):
         """Remove all packages from self.repository."""
         create_file(self.repository_dir + "/Packages", "")