Merge lp:~bigkevmcd/landscape-client/bug-710621-exit-more-gracefully into lp:~landscape/landscape-client/trunk

[Kevin McDermott]

[Björn Tillenius (bjornt)]

Looks good to me, +1!

[1]

+ self.assertEqual(error.message,
+ "Unable to setup logging. Read-only filesystem.")

I would say that the expected output should be the first argument, but I'm fine with leaving it as it is, to keep it consistent with the rest of the tests in this file.

review: Approve

[Frank Wierzbicki (fwierzbicki)]

Some pep8 lints:

landscape/sysinfo/tests/test_deployment.py:237:48: E225 missing whitespace around operator
landscape/sysinfo/tests/test_deployment.py:285:80: E501 line too long (87 characters)

otherwise, looks good to me +1!

review: Approve

=== modified file 'landscape/sysinfo/deployment.py'
--- landscape/sysinfo/deployment.py	2010-06-08 19:43:02 +0000
+++ landscape/sysinfo/deployment.py	2011-02-08 08:12:57 +0000
@@ -1,5 +1,6 @@
 """Deployment code for the sysinfo tool."""
 import os
+import sys
 from logging import getLogger, Formatter
 from logging.handlers import RotatingFileHandler
 
@@ -91,7 +92,10 @@
     """
     @param reactor: The reactor to (optionally) run the sysinfo plugins in.
     """
-    setup_logging()
+    try:
+        setup_logging()
+    except IOError, e:
+        sys.exit("Unable to setup logging. %s" % e)
 
     if sysinfo is None:
         sysinfo = SysInfoPluginRegistry()

=== modified file 'landscape/sysinfo/tests/test_deployment.py'
--- landscape/sysinfo/tests/test_deployment.py	2010-06-08 07:59:32 +0000
+++ landscape/sysinfo/tests/test_deployment.py	2011-02-08 08:12:57 +0000
@@ -275,3 +275,13 @@
         self.mocker.replay()
 
         run(["--sysinfo-plugins", "TestPlugin"])
+
+    def test_run_setup_logging_exits_gracefully(self):
+        setup_logging_mock = self.mocker.replace(
+            "landscape.sysinfo.deployment.setup_logging")
+        setup_logging_mock()
+        self.mocker.throw(IOError("Read-only filesystem."))
+        self.mocker.replay()
+        error = self.assertRaises(SystemExit, run, ["--sysinfo-plugins", "TestPlugin"])
+        self.assertEqual(error.message,
+                         "Unable to setup logging. Read-only filesystem.")