Merge lp:~javier.collado/utah/bug1160032 into lp:utah

[Javier Collado]

A couple of return codes have been added to deal with the invalid user problem
described in the bug and also when an exception is caught.

I've found that argparse also returns its own return code when a parsing error
happens, but I'll create a separate bug for that since it affects both the
server and the client.

[Max Brustkern (nuclearbob)]

Looks good to me, as long as you've tested it.

review: Approve

[Javier Collado (javier.collado)]

Yes, I've tested it.

review: Approve

=== modified file 'client.py'
--- client.py	2013-03-01 13:04:22 +0000
+++ client.py	2013-04-02 14:03:31 +0000
@@ -25,7 +25,10 @@
 from utah.client.state_agent import StateAgentYAML
 from utah.client.result import Result, ResultYAML, ResultJSON
 
-from utah.client.common import DEFAULT_STATE_FILE
+from utah.client.common import (
+    DEFAULT_STATE_FILE,
+    ReturnCodes,
+)
 from utah.client.exceptions import UTAHClientError
 
 
@@ -73,11 +76,6 @@
     return parser
 
 
-def exit(returncode, msg):
-    print msg
-    sys.exit(returncode)
-
-
 def setup_logging(debug=False):
     if debug:
         level = logging.DEBUG
@@ -102,7 +100,7 @@
         sys.stderr.write('{}: UTAH client is expected '
                          'to be executed as root user\n'
                          .format(parser.prog))
-        sys.exit(3)
+        sys.exit(ReturnCodes.INVALID_USER)
 
     setup_logging(args.debug)
 
@@ -133,8 +131,8 @@
         try:
             sys.stdout = open(output, open_flags)
         except IOError as e:
-            exit(e.errno, e)
-
+            sys.stderr.write(str(e))
+            sys.exit(ReturnCodes.EXCEPTION_ERROR)
     if args.format == 'text':
         result_class = Result
     elif args.format == 'json':
@@ -154,8 +152,8 @@
         returncode = runner.run()
 
     except UTAHClientError as e:
-        errno = getattr(e, 'errno', 1)
-        exit(errno, e)
+        sys.stderr.write(str(e))
+        sys.exit(ReturnCodes.EXCEPTION_ERROR)
 
     sys.exit(returncode)
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-01 11:56:56 +0000
+++ debian/changelog	2013-04-02 14:03:31 +0000
@@ -4,6 +4,7 @@
   * Remove temporary files downloaded based on URL (LP: #1101186)
   * Stop server on installation failure (LP: #1161855)
   * Check group after command line argument parsing (LP: #1126219)
+  * Added INVALID_USER return code (LP: #1160032)
 
  -- Javier Collado <[e-mail]>  Wed, 27 Mar 2013 13:00:47 +0100
 

=== modified file 'utah/client/common.py'
--- utah/client/common.py	2013-03-21 15:43:29 +0000
+++ utah/client/common.py	2013-04-02 14:03:31 +0000
@@ -63,12 +63,15 @@
 # REBOOT: The system under test rebooted as required by a test case. To get
 # final result the state file has to be checked.
 # UNKNOWN: Unable to retrieve state file to check if client finished properly.
+# INVALID_GROUP: The client was launched with a user other than root.
 class ReturnCodes:
     PASS = 0
     FAIL = 1
     ERROR = 2
     REBOOT = 3
     UNKNOWN = 4
+    INVALID_USER = 5
+    EXCEPTION_ERROR = 6
 
 CMD_TC_BUILD = 'testcase_build'
 CMD_TC_SETUP = 'testcase_setup'