Merge lp:~bjornt/landscape-client/remove-apt-check into lp:~landscape/landscape-client/trunk

[Björn Tillenius]

Simple branch that removes the check whether Apt is new enough. Since
we've removed SmartFacade and won't release new clients to Hardy, it's
better to have the tests fail to show that the client won't work.

[Alberto Donato (ack)]

Looks good, +1!

review: Approve

[Free Ekanayaka (free.ekanayaka)]

Agreed, +1!

review: Approve

=== modified file 'landscape/package/facade.py'
--- landscape/package/facade.py	2012-05-08 23:29:19 +0000
+++ landscape/package/facade.py	2012-05-08 23:29:19 +0000
@@ -15,15 +15,9 @@
 import apt_inst
 import apt_pkg
 
-has_new_enough_apt = True
 from aptsources.sourceslist import SourcesList
-try:
-    from apt.progress.text import AcquireProgress
-    from apt.progress.base import InstallProgress
-except ImportError:
-    AcquireProgress = object
-    InstallProgress = object
-    has_new_enough_apt = False
+from apt.progress.text import AcquireProgress
+from apt.progress.base import InstallProgress
 
 from landscape.lib.fs import append_file, create_file, read_file
 from landscape.constants import UBUNTU_PATH

=== modified file 'landscape/package/tests/test_changer.py'
--- landscape/package/tests/test_changer.py	2012-05-08 23:29:19 +0000
+++ landscape/package/tests/test_changer.py	2012-05-08 23:29:19 +0000
@@ -13,7 +13,7 @@
     POLICY_ALLOW_ALL_CHANGES, ERROR_RESULT)
 from landscape.package.store import PackageStore
 from landscape.package.facade import (
-    DependencyError, TransactionError, has_new_enough_apt)
+    DependencyError, TransactionError)
 from landscape.package.changer import (
     PackageChangerConfiguration, ChangePackagesResult)
 from landscape.tests.mocker import ANY
@@ -867,9 +867,6 @@
 
 class AptPackageChangerTest(LandscapeTest, PackageChangerTestMixin):
 
-    if not has_new_enough_apt:
-        skip = "Can't use AptFacade on hardy"
-
     helpers = [AptFacadeHelper, SimpleRepositoryHelper, BrokerServiceHelper]
 
     def setUp(self):

=== modified file 'landscape/package/tests/test_facade.py'
--- landscape/package/tests/test_facade.py	2012-05-08 23:29:19 +0000
+++ landscape/package/tests/test_facade.py	2012-05-08 23:29:19 +0000
@@ -9,8 +9,7 @@
 from landscape.constants import UBUNTU_PATH
 from landscape.lib.fs import read_file, create_file
 from landscape.package.facade import (
-    TransactionError, DependencyError, ChannelError, AptFacade,
-    has_new_enough_apt)
+    TransactionError, DependencyError, ChannelError, AptFacade)
 
 from landscape.tests.mocker import ANY
 from landscape.tests.helpers import LandscapeTest, EnvironSaverHelper
@@ -43,9 +42,6 @@
 
 class AptFacadeTest(LandscapeTest):
 
-    if not has_new_enough_apt:
-        skip = "Can't use AptFacade on hardy"
-
     helpers = [AptFacadeHelper, EnvironSaverHelper]
 
     def version_sortkey(self, version):

=== modified file 'landscape/package/tests/test_reporter.py'
--- landscape/package/tests/test_reporter.py	2012-05-08 23:29:19 +0000
+++ landscape/package/tests/test_reporter.py	2012-05-08 23:29:19 +0000
@@ -16,7 +16,7 @@
     PackageReporter, HASH_ID_REQUEST_TIMEOUT, main, find_reporter_command,
     PackageReporterConfiguration, FakeGlobalReporter, FakeReporter)
 from landscape.package import reporter
-from landscape.package.facade import AptFacade, has_new_enough_apt
+from landscape.package.facade import AptFacade
 from landscape.package.tests.helpers import (
     AptFacadeHelper, SimpleRepositoryHelper,
     HASH1, HASH2, HASH3, PKGNAME1)
@@ -1084,9 +1084,6 @@
 
 class PackageReporterAptTest(LandscapeTest, PackageReporterTestMixin):
 
-    if not has_new_enough_apt:
-        skip = "Can't use AptFacade on hardy"
-
     helpers = [AptFacadeHelper, SimpleRepositoryHelper, BrokerServiceHelper]
 
     Facade = AptFacade
@@ -1384,9 +1381,6 @@
 
 class GlobalPackageReporterAptTest(LandscapeTest):
 
-    if not has_new_enough_apt:
-        skip = "Can't use AptFacade on hardy"
-
     helpers = [AptFacadeHelper, SimpleRepositoryHelper, BrokerServiceHelper]
 
     def setUp(self):

=== modified file 'landscape/package/tests/test_skeleton.py'
--- landscape/package/tests/test_skeleton.py	2012-05-08 23:29:19 +0000
+++ landscape/package/tests/test_skeleton.py	2012-05-08 23:29:19 +0000
@@ -1,4 +1,3 @@
-from landscape.package.facade import has_new_enough_apt
 from landscape.package.skeleton import (
     build_skeleton_apt, DEB_PROVIDES,
     DEB_NAME_PROVIDES, DEB_REQUIRES, DEB_OR_REQUIRES, DEB_UPGRADES,
@@ -248,9 +247,6 @@
 class SkeletonAptTest(LandscapeTest, SkeletonTestMixin):
     """C{PackageSkeleton} tests for apt packages."""
 
-    if not has_new_enough_apt:
-        skip = "Can't use AptFacade on hardy"
-
     helpers = [AptFacadeHelper, SkeletonTestHelper]
 
     def setUp(self):

=== modified file 'landscape/package/tests/test_taskhandler.py'
--- landscape/package/tests/test_taskhandler.py	2012-05-08 23:29:19 +0000
+++ landscape/package/tests/test_taskhandler.py	2012-05-08 23:29:19 +0000
@@ -9,7 +9,6 @@
 from landscape.package.taskhandler import (
     PackageTaskHandlerConfiguration, PackageTaskHandler, run_task_handler,
     LazyRemoteBroker)
-from landscape.package import facade as facade_module
 from landscape.package.facade import AptFacade
 from landscape.package.store import HashIdStore, PackageStore
 from landscape.package.tests.helpers import AptFacadeHelper
@@ -374,14 +373,11 @@
 
         return HandlerMock, handler_args
 
-    def test_run_task_handler_new_apt(self):
+    def test_run_task_handler(self):
         """
         The L{run_task_handler} function creates and runs the given task
-        handler with the proper arguments. If the system has a new
-        enough version of Apt (i.e. newer than Hardy), AptFacade will
-        be used.
+        handler with the proper arguments.
         """
-        self._set_new_enough_apt(True)
         HandlerMock, handler_args = self._mock_run_task_handler()
 
         def assert_task_handler(ignored):
@@ -413,20 +409,6 @@
         result = run_task_handler(HandlerMock, ["-c", self.config_filename])
         return result.addCallback(assert_task_handler)
 
-    def _set_new_enough_apt(self, value):
-        """Override landscape.package.facade.has_new_enough_apt.
-
-        The previous value of that attribute is replaced when the test
-        is finished.
-        """
-
-        def reset_new_enough_apt():
-            facade_module.has_new_enough_apt = old_has_new_enough_apt
-
-        old_has_new_enough_apt = facade_module.has_new_enough_apt
-        facade_module.has_new_enough_apt = value
-        self.addCleanup(reset_new_enough_apt)
-
     def test_run_task_handler_when_already_locked(self):
 
         lock_path(os.path.join(self.data_path, "package", "default.lock"))