Merge lp:~bjornt/landscape-client/send-apt-sources into lp:~landscape/landscape-client/trunk

[Björn Tillenius]

Report a package reporter error to the server if no APT sources are configure, to trigger a PackageReporterAlert.

[Free Ekanayaka (free.ekanayaka)]

Great, +1!

review: Approve

[Alberto Donato (ack)]

Looks good! +1

review: Approve

=== modified file 'landscape/package/reporter.py'
--- landscape/package/reporter.py	2011-07-06 12:34:11 +0000
+++ landscape/package/reporter.py	2011-08-10 14:57:35 +0000
@@ -199,6 +199,10 @@
             logging.debug("'%s' exited with status %d (out='%s', err='%s'" % (
                 self.smart_update_filename, code, out, err))
             touch_file(self._config.smart_update_stamp_filename)
+            if not smart_failed and not self._facade.get_channels():
+                code = 1
+                err = "There are no APT sources configured in %s or %s." % (
+                    self.sources_list_filename, self.sources_list_directory)
             deferred = self._broker.call_if_accepted(
                 "package-reporter-result", self.send_result, code, err)
             deferred.addCallback(lambda ignore: (out, err, code))

=== modified file 'landscape/package/tests/test_reporter.py'
--- landscape/package/tests/test_reporter.py	2011-07-05 05:09:11 +0000
+++ landscape/package/tests/test_reporter.py	2011-08-10 14:57:35 +0000
@@ -662,7 +662,7 @@
         reactor.callWhenRunning(do_test)
         return deferred
 
-    def test_run_smart_update_report_failures(self):
+    def test_run_smart_update_report_smart_failure(self):
         """
         If L{PackageReporter.run_smart_update} fails, a message is sent to the
         server reporting the error, to be able to fix the problem centrally.
@@ -687,6 +687,63 @@
         reactor.callWhenRunning(do_test)
         return deferred
 
+    def test_run_smart_update_report_no_sources(self):
+        """
+        L{PackageReporter.run_smart_update} reports a failure if smart
+        succeeds but there are no APT sources defined. Smart doesn't
+        fail if there are no sources, but we fake a failure in order to
+        re-use the PackageReporterAlert on the server.
+        """
+        self.facade.reset_channels()
+        message_store = self.broker_service.message_store
+        message_store.set_accepted_types(["package-reporter-result"])
+        self.reporter.smart_update_filename = self.makeFile(
+            "#!/bin/sh\necho -n error >&2\necho -n output\nexit 0")
+        os.chmod(self.reporter.smart_update_filename, 0755)
+        deferred = Deferred()
+
+        def do_test():
+            result = self.reporter.run_smart_update()
+
+            def callback(ignore):
+                error = "There are no APT sources configured in %s or %s." % (
+                    self.reporter.sources_list_filename,
+                    self.reporter.sources_list_directory)
+                self.assertMessages(message_store.get_pending_messages(),
+                    [{"type": "package-reporter-result",
+                      "code": 1, "err": error}])
+            result.addCallback(callback)
+            result.chainDeferred(deferred)
+
+        reactor.callWhenRunning(do_test)
+        return deferred
+
+    def test_run_smart_update_report_smart_failure_no_sources(self):
+        """
+        If L{PackageReporter.run_smart_update} fails and there are no
+        APT sources configured, the Smart error takes precedence.
+        """
+        self.facade.reset_channels()
+        message_store = self.broker_service.message_store
+        message_store.set_accepted_types(["package-reporter-result"])
+        self.reporter.smart_update_filename = self.makeFile(
+            "#!/bin/sh\necho -n error >&2\necho -n output\nexit 2")
+        os.chmod(self.reporter.smart_update_filename, 0755)
+        deferred = Deferred()
+
+        def do_test():
+            result = self.reporter.run_smart_update()
+
+            def callback(ignore):
+                self.assertMessages(message_store.get_pending_messages(),
+                    [{"type": "package-reporter-result",
+                      "code": 2, "err": u"error"}])
+            result.addCallback(callback)
+            result.chainDeferred(deferred)
+
+        reactor.callWhenRunning(do_test)
+        return deferred
+
     def test_run_smart_update_report_success(self):
         """
         L{PackageReporter.run_smart_update} also reports success to be able to