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

[Javier Collado]

This branch contains changes to:
- Check that the client is executed as root
- Make run_as mandatory in the tc_control file (keeping optional in the ts_control file)

I've run a few tests and they worked fine except for the case in which `run_as` was also included
in the test suite. However when `run_as` was included in the test suite as an override, then it worked fine.

In my opinion both `command` and `run_as` in the test suite should be specified as overrides
to make clear that the tester is aware about them being defined in the tc_control file already.
If you agree on this, I can remove both fields from the test suite schema.

[lp:~javier.collado/utah/bug1047351]

721. By Javier Collado on 2012-10-17

Removed `command` and `run_as` from test suite schema

They are only removed from the schema at the same level as `test`. Both can
still be used below `overrides` and that's the way they're expected to be used.

[Joe Talbott (joetalbott)]

Looks good to me.

review: Approve

=== modified file 'client.py'
--- client.py	2012-10-03 09:07:18 +0000
+++ client.py	2012-10-17 15:25:28 +0000
@@ -3,9 +3,9 @@
 import logging
 import platform
 import sys
+import os
 
 from utah.url import url_argument
-from utah.group import check_user_group, print_group_error_message
 from utah.client.runner import Runner
 from utah.client.state_agent import StateAgentYAML
 from utah.client.result import Result, ResultYAML, ResultJSON
@@ -82,11 +82,11 @@
     parser = get_parser()
     args = parser.parse_args()
 
-    # When resuming, this script is invoked as root by rc.local
-    # No group membership is assigned then, so root needs to be able to run
-    # this script anyway
-    if not check_user_group(rootok=args.resume):
-        print_group_error_message(__file__)
+    if not os.getuid() == 0:
+        parser.print_usage()
+        sys.stderr.write('{}: UTAH client is expected '
+                         'to be executed as root user\n'
+                         .format(parser.prog))
         sys.exit(3)
 
     setup_logging(args.debug)
@@ -94,11 +94,6 @@
     logging.debug(args)
     logging.info(platform.uname())
 
-    """
-    print args
-    import sys
-    sys.exit(0)
-    """
     resume = args.resume
     state_file = args.state_file
     testdir = args.testdir
 
=== modified file 'utah/client/README'
--- utah/client/README	2012-10-10 14:44:00 +0000
+++ utah/client/README	2012-10-17 15:25:28 +0000
@@ -45,8 +45,6 @@
 ######################################################################
 
 - test: <testcase directory name>
-  [command: <test case command line>]
-  [run_as: <userid>]
   [overrides: 
     - <tc_control override>
     - <tc_control override>
@@ -77,7 +75,8 @@
 type: <type>
 [timeout: <timeout in secs>]
 [build_cmd: <build command>]
-[command: <testcase command>]
+command: <testcase command>
+run_as: <user>
 [tc_setup: <testcase setup command>]
 [tc_cleanup: <testcase cleanup command>]
 [reboot: {always, pass, never}] # defaults to 'never'
 
=== modified file 'utah/client/examples/examples/test_one/tc_control'
--- utah/client/examples/examples/test_one/tc_control	2012-04-04 21:52:30 +0000
+++ utah/client/examples/examples/test_one/tc_control	2012-10-17 15:25:28 +0000
@@ -9,6 +9,7 @@
 type: userland
 #timeout: 200
 command: echo "runit"
+run_as: utah
 #build_cmd: echo "building"
 tc_setup: echo "setup"
 tc_cleanup: echo "cleanup"
 
=== modified file 'utah/client/examples/examples/test_two/tc_control'
--- utah/client/examples/examples/test_two/tc_control	2012-08-16 10:23:36 +0000
+++ utah/client/examples/examples/test_two/tc_control	2012-10-17 15:25:28 +0000
@@ -9,6 +9,7 @@
 type: userland
 timeout: 200
 command: echo "runit"
+run_as: utah
 build_cmd: echo "building"
 tc_setup: echo "setup"
 tc_cleanup: echo "cleanup"
 
=== modified file 'utah/client/examples/pass.run'
--- utah/client/examples/pass.run	2012-10-10 14:44:00 +0000
+++ utah/client/examples/pass.run	2012-10-17 15:25:28 +0000
@@ -6,4 +6,4 @@
 testsuites:
   - name: utah_tests_sample
     fetch_method: bzr
-	fetch_location: /usr/share/utah/client/examples/utah_tests_sample
+    fetch_location: /usr/share/utah/client/examples/utah_tests_sample
 
=== modified file 'utah/client/examples/utah_tests/test_one/tc_control'
--- utah/client/examples/utah_tests/test_one/tc_control	2012-08-16 11:01:45 +0000
+++ utah/client/examples/utah_tests/test_one/tc_control	2012-10-17 15:25:28 +0000
@@ -1,5 +1,6 @@
 description: A first sample test case.
 command: python test_one.py
+run_as: utah
 dependencies: n/a
 action: |
   1. Action 1
 
=== modified file 'utah/client/examples/utah_tests/test_two/tc_control'
--- utah/client/examples/utah_tests/test_two/tc_control	2012-08-13 16:22:08 +0000
+++ utah/client/examples/utah_tests/test_two/tc_control	2012-10-17 15:25:28 +0000
@@ -1,5 +1,6 @@
 description: A second sample test case.
 command: python test_two.py
+run_as: utah
 dependencies: n/a
 action: |
   1. Action 1
 
=== modified file 'utah/client/examples/utah_tests_sample/sample_one/tc_control'
--- utah/client/examples/utah_tests_sample/sample_one/tc_control	2012-08-16 10:23:36 +0000
+++ utah/client/examples/utah_tests_sample/sample_one/tc_control	2012-10-17 15:25:28 +0000
@@ -8,5 +8,6 @@
 timeout: 200
 build_cmd: echo "building for sample_one"
 command: python sample.py
+run_as: utah
 tc_setup: echo "setup for sample_one"
 tc_cleanup: echo "cleanup for sample_one"
 
=== modified file 'utah/client/testcase.py'
--- utah/client/testcase.py	2012-10-11 15:23:37 +0000
+++ utah/client/testcase.py	2012-10-17 15:25:28 +0000
@@ -64,6 +64,10 @@
                 'type': 'string',
                 'required': True,
                 },
+            'run_as': {
+                'type': 'string',
+                'required': True,
+                },
             'tc_setup': {'type': 'string'},
             'tc_cleanup': {'type': 'string'},
             'reboot': {
 
=== modified file 'utah/client/testsuite.py'
--- utah/client/testsuite.py	2012-10-11 13:47:30 +0000
+++ utah/client/testsuite.py	2012-10-17 15:25:28 +0000
@@ -50,8 +50,6 @@
                     'type': 'string',
                     'required': True,
                     },
-                'command': {'type': 'string'},
-                'run_as': {'type': 'string'},
                 'overrides': {'type': 'object'},
                 },
             },
 
=== modified file 'utah/group.py'
--- utah/group.py	2012-10-04 15:56:03 +0000
+++ utah/group.py	2012-10-17 15:25:28 +0000
@@ -9,13 +9,10 @@
 from utah import config
 
 
-def check_user_group(group=config.group, rootok=False):
+def check_user_group(group=config.group):
     """
     Return if the user is a member of the given group
     """
-    if rootok and os.getuid() == 0:
-        return True
-
     user_gids = os.getgroups()
     gid = grp.getgrnam(group).gr_gid