Merge lp:~free.ekanayaka/landscape-client/help-as-non-root into lp:~landscape/landscape-client/trunk

[Free Ekanayaka]

In case --help is passed, no check on the process uid is performed.

[Kevin McDermott (bigkevmcd)]

-h is a synonym for --help, so that should probably be included...

Other than that, this has annoyed me too, so am happy to see it fixed :-)

review: Approve

[lp:~free.ekanayaka/landscape-client/help-as-non-root]

282. By Free Ekanayaka on 2010-08-04

Also let 'landscape-config -h' be run as non-root

[Free Ekanayaka (free.ekanayaka)]

Good point Kevin, that's fixed, thanks!

[Jamu Kakar (jkakar)]

[1]

The docstrings for the two new tests can go on a single line.

Thanks for fixing this, +1!

review: Approve

[Free Ekanayaka (free.ekanayaka)]

Thanks Jamu, that's fixed!

[lp:~free.ekanayaka/landscape-client/help-as-non-root]

283. By Free Ekanayaka on 2010-08-06

Fit docstrings in one line (Jamu)

=== modified file 'landscape/configuration.py'
--- landscape/configuration.py	2010-07-30 10:04:18 +0000
+++ landscape/configuration.py	2010-08-06 07:46:42 +0000
@@ -607,16 +607,21 @@
 
 
 def main(args):
+    config = LandscapeSetupConfiguration(fetch_import_url)
+    if args in (["-h"], ["--help"]):
+        # We let landscape-config --help to be run as normal user
+        config.load(args)
+
     if os.getuid() != 0:
         sys.exit("landscape-config must be run as root.")
 
-    config = LandscapeSetupConfiguration(fetch_import_url)
     try:
         config.load(args)
     except ImportOptionError, error:
         print_text(str(error), error=True)
         sys.exit(1)
 
+
     # Disable startup on boot and stop the client, if one is running.
     if config.disable:
         stop_client_and_disable_init_script()

=== modified file 'landscape/tests/test_configuration.py'
--- landscape/tests/test_configuration.py	2010-07-30 13:05:59 +0000
+++ landscape/tests/test_configuration.py	2010-08-06 07:46:42 +0000
@@ -1,6 +1,7 @@
 import os
 from getpass import getpass
 from ConfigParser import ConfigParser
+from cStringIO import StringIO
 
 from twisted.internet.defer import succeed, fail
 
@@ -1077,6 +1078,26 @@
                                      main, ["-c", self.make_working_config()])
         self.assertIn("landscape-config must be run as root", str(sys_exit))
 
+    def test_main_with_help_and_non_root(self):
+        """It's possible to call 'landscape-config --help' as normal user."""
+        self.mocker.reset() # Forget the thing done in setUp
+        output = StringIO()
+        self.mocker.replace("sys.stdout").write(ANY)
+        self.mocker.call(output.write)
+        self.mocker.replay()
+        self.assertRaises(SystemExit, main, ["--help"])
+        self.assertIn("show this help message and exit", output.getvalue())
+
+    def test_main_with_help_and_non_root_short(self):
+        """It's possible to call 'landscape-config -h' as normal user."""
+        self.mocker.reset() # Forget the thing done in setUp
+        output = StringIO()
+        self.mocker.replace("sys.stdout").write(ANY)
+        self.mocker.call(output.write)
+        self.mocker.replay()
+        self.assertRaises(SystemExit, main, ["-h"])
+        self.assertIn("show this help message and exit", output.getvalue())
+
     def test_import_from_file(self):
         sysvconfig_mock = self.mocker.patch(SysVConfig)
         sysvconfig_mock.set_start_on_boot(True)