Merge lp:~pwlars/utah/phablet-sudo-commands into lp:utah

Proposed by Paul Larson
Status: Merged
Merged at revision: 1053
Proposed branch: lp:~pwlars/utah/phablet-sudo-commands
Merge into: lp:utah
Diff against target: 44 lines (+5/-5)
1 file modified
examples/run_utah_phablet.py (+5/-5)
To merge this branch: bzr merge lp:~pwlars/utah/phablet-sudo-commands
Reviewer Review Type Date Requested Status
Para Siva (community) Approve
Review via email: mp+231804@code.launchpad.net

Description of the change

I was able to get utah based tests passing with this change for phablet runs.

To post a comment you must log in.
Revision history for this message
Para Siva (psivaa) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'examples/run_utah_phablet.py'
--- examples/run_utah_phablet.py 2013-11-04 15:37:54 +0000
+++ examples/run_utah_phablet.py 2014-08-21 20:24:36 +0000
@@ -135,13 +135,13 @@
135 with open(ofile, 'w') as f:135 with open(ofile, 'w') as f:
136 f.write(buf)136 f.write(buf)
137137
138 buf = device.run_ubuntu('dmesg', False)138 buf = device.run_ubuntu('sudo dmesg', False)
139 ofile = os.path.join(results_dir, 'dmesg.log')139 ofile = os.path.join(results_dir, 'dmesg.log')
140 with open(ofile, 'w') as f:140 with open(ofile, 'w') as f:
141 f.write(buf)141 f.write(buf)
142142
143 buf = device.run_ubuntu(143 buf = device.run_ubuntu(
144 '/var/lib/lxc/android/rootfs/system/bin/logcat -d', False)144 'sudo /var/lib/lxc/android/rootfs/system/bin/logcat -d', False)
145 ofile = os.path.join(results_dir, 'logcat.log')145 ofile = os.path.join(results_dir, 'logcat.log')
146 with open(ofile, 'w') as f:146 with open(ofile, 'w') as f:
147 f.write(buf)147 f.write(buf)
@@ -165,7 +165,7 @@
165 device.create_file_ubuntu('/etc/init/run_utah.conf', '\n'.join(buf))165 device.create_file_ubuntu('/etc/init/run_utah.conf', '\n'.join(buf))
166166
167 p = '/etc/utah/autorun'167 p = '/etc/utah/autorun'
168 device.run_ubuntu('sh -c "[ -d {} ] || mkdir -p {}"'.format(p, p))168 device.run_ubuntu('sudo sh -c "[ -d {} ] || mkdir -p {}"'.format(p, p))
169169
170 if not env:170 if not env:
171 env = ''171 env = ''
@@ -268,7 +268,7 @@
268 if args.serial:268 if args.serial:
269 env['ANDROID_SERIAL'] = args.serial269 env['ANDROID_SERIAL'] = args.serial
270270
271 device.run_ubuntu('mkdir {}'.format(CLIENT_PROBES_DIR))271 device.run_ubuntu('sudo mkdir {}'.format(CLIENT_PROBES_DIR))
272272
273 host = os.path.join(args.results_dir, 'utah-host.yml')273 host = os.path.join(args.results_dir, 'utah-host.yml')
274 tmpdir = tempfile.mkdtemp()274 tmpdir = tempfile.mkdtemp()
@@ -329,7 +329,7 @@
329329
330 """330 """
331 device.run_ubuntu(331 device.run_ubuntu(
332 'rm -rf /var/lib/utah/utah.yaml /tmp/utah.log {}'.format(332 'sudo rm -rf /var/lib/utah/utah.yaml /tmp/utah.log {}'.format(
333 CLIENT_PROBES_DIR))333 CLIENT_PROBES_DIR))
334334
335335

Subscribers

People subscribed via source and target branches