Merge lp:~pwlars/utah/utah-phablet-noroot into lp:utah

[Paul Larson]

Add an option for bypassing the check for root permissions to be used for running host-side phablet tests

The phablet runner for utah actually doesn't need root, since we're running everything host-side. Add an option to utah so that we can bypass the check for root permissions in cases like this, and have run_utah_phablet use that option

[Para Siva (psivaa)]

+1, thanks for clarifying this too Paul

review: Approve

[lp:~pwlars/utah/utah-phablet-noroot]

1059. By Paul Larson on 2014-09-24

0.15+20140924-0ubuntu1

=== modified file 'client.py'
--- client.py	2014-02-26 17:54:17 +0000
+++ client.py	2014-09-24 20:17:42 +0000
@@ -83,6 +83,8 @@
                         help='Choose which battery implementation to use.')
     parser.add_argument('-p', '--probe-dir', default='/tmp',
                         help='Directory to store probe files.')
+    parser.add_argument('--no-root', action='store_true',
+                        help='Do not require root permissions')
 
     return parser
 
@@ -119,7 +121,7 @@
     except SystemExit:
         sys.exit(ReturnCodes.CMD_PARSING_ERROR)
 
-    if not os.getuid() == 0:
+    if not args.no_root and not os.getuid() == 0:
         parser.print_usage()
         msg = ('{}: UTAH client is expected to be executed as root user\n'
                .format(parser.prog))

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-11 15:14:15 +0000
+++ debian/changelog	2014-09-24 20:17:42 +0000
@@ -1,3 +1,10 @@
+utah (0.15+20140924-0ubuntu1) utopic; urgency=medium
+
+  * Add an option to bypass checking for root permission, because
+sometimes we don't need it
+
+ -- Paul Larson <[e-mail]>  Wed, 24 Sep 2014 15:15:35 -0500
+
 utah (0.15+20140911-0ubuntu1) utopic; urgency=medium
 
   * Adjust the sleep time before VM shutdown

=== modified file 'examples/run_utah_phablet.py'
--- examples/run_utah_phablet.py	2014-08-21 20:23:01 +0000
+++ examples/run_utah_phablet.py	2014-09-24 20:17:42 +0000
@@ -272,7 +272,7 @@
 
     host = os.path.join(args.results_dir, 'utah-host.yml')
     tmpdir = tempfile.mkdtemp()
-    cmd = '{} -d -o {} -r {} -p {} -t {}'.format(
+    cmd = '{} -d -o {} -r {} -p {} -t {} --no-root'.format(
         args.utah_cmd, host, args.runlist, args.results_dir, tmpdir)
     rc = subprocess.call(cmd, env=env, shell=True)
     print('utah runlist exited with rc={}'.format(rc))