Merge lp:~bjornt/landscape-client/apt-facade-remaining-tests into lp:~landscape/landscape-client/trunk

[Björn Tillenius]

Make sure that ReleaseUpgrader and PackageTaskHandler tests can be run
with AptFacade instead of SmartFacade.

For ReleaseUpgrader I simply remove the setup of a facade, since the
facade isn't used by ReleaseUpgrader.

For PackageTaskHandler I made a change to AptFacade to be able to set
the architecture to None. This makes the PackageTaskHandler tests pass,
if I change them to use AptFacadeHelper instead of SmartFacadeHelper.

I didn't bother actually running the tests for both SmartFacade and
AptFacade, since the changes are minimal. When the time comes to remove
SmartFacade we can change it to use AptFacadeHelper, without changing
anything else.

[Thomas Herve (therve)]

Looks good, +1.

review: Approve

[Frank Wierzbicki (fwierzbicki)]

Looks good, +1!

review: Approve

=== modified file 'landscape/package/facade.py'
--- landscape/package/facade.py	2011-11-14 09:38:52 +0000
+++ landscape/package/facade.py	2011-11-15 10:09:24 +0000
@@ -245,6 +245,8 @@
 
         Setting multiple architectures aren't supported.
         """
+        if architecture is None:
+            architecture = ""
         # From oneiric and onwards Architectures is used to set which
         # architectures can be installed, in case multiple architectures
         # are supported. We force it to be single architecture, until we

=== modified file 'landscape/package/tests/test_facade.py'
--- landscape/package/tests/test_facade.py	2011-11-14 09:38:52 +0000
+++ landscape/package/tests/test_facade.py	2011-11-15 10:09:24 +0000
@@ -379,6 +379,16 @@
         self.facade.set_arch("i386")
         self.assertEqual("i386", self.facade.get_arch())
 
+    def test_get_set_arch_none(self):
+        """
+        If C{None} is passed to C{set_arch()}, the architecture is set
+        to "", since it can't be set to C{None}. This is to ensure
+        compatibility with C{SmartFacade}, and the architecture should
+        be set to C{None} in tests only.
+        """
+        self.facade.set_arch(None)
+        self.assertEqual("", self.facade.get_arch())
+
     def test_set_arch_get_packages(self):
         """
         After the architecture is set, APT really uses the value.

=== modified file 'landscape/package/tests/test_releaseupgrader.py'
--- landscape/package/tests/test_releaseupgrader.py	2011-07-21 17:09:22 +0000
+++ landscape/package/tests/test_releaseupgrader.py	2011-11-15 10:09:24 +0000
@@ -14,7 +14,6 @@
     ReleaseUpgrader, ReleaseUpgraderConfiguration, main)
 from landscape.tests.helpers import (
     LandscapeTest, BrokerServiceHelper, LogKeeperHelper, EnvironSaverHelper)
-from landscape.package.tests.helpers import SmartFacadeHelper
 from landscape.manager.manager import SUCCEEDED, FAILED
 
 
@@ -33,7 +32,7 @@
 
 class ReleaseUpgraderTest(LandscapeTest):
 
-    helpers = [LogKeeperHelper, SmartFacadeHelper,
+    helpers = [LogKeeperHelper,
                EnvironSaverHelper, BrokerServiceHelper]
 
     def setUp(self):
@@ -44,7 +43,7 @@
             os.mkdir(self.config.package_directory)
             os.mkdir(self.config.upgrade_tool_directory)
             self.store = PackageStore(self.makeFile())
-            self.upgrader = ReleaseUpgrader(self.store, self.facade,
+            self.upgrader = ReleaseUpgrader(self.store, None,
                                             self.remote, self.config)
             service = self.broker_service
             service.message_store.set_accepted_types(["operation-result"])