Merge lp:~sergiusens/phablet-tools/emu_prov into lp:phablet-tools

[Sergio Schvezov]

Adding emulator (and future ap) provisioning; in the future this would only work if the tests are py3.

Tested from the branch like
PATH=$PWD:$PATH click-buddy --dir ~/source/apps/clock/trunk --provision
PATH=$PWD:$PATH phablet-test-run -o $(mktemp -d) -f xml ubuntu_clock_app

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:244
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/279/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/51

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/279/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Works fine, but I would like to see a one option added to click-buddy:

1) Support to skip the phablet-config autopilot --setup step; in the case where we already have pulled things, we don't need to do it again. Heck, I'm not even sure the step should be on by default. The first time you run tests from your project it's needed, but after you don't need it. I suppose having it default means it will do the right thing for new folks, but I'd like to be able to skip it at least.. Just makes me want to adb push even more if it takes too long . . .

In addition;

2) Potentially provision and push tests only; don't push the click package. I might want to test using the pre-installed click, but with my newer tests. This is really a corner case, and not important or critical. I wouldn't hold up this merge for it :-)

review: Needs Fixing

Unmerged revisions

244. By Sergio Schvezov on 2014-02-20

Adding emulator (and future ap) provisioning; in the future this would only work if the tests ar py3.

=== modified file 'click-buddy'
--- click-buddy	2014-01-20 18:31:52 +0000
+++ click-buddy	2014-02-20 13:39:04 +0000
@@ -123,6 +123,7 @@
     done
 
     adb $ADBOPTS shell mkdir -p /home/$DEVICE_USER/autopilot
+    phablet-config autopilot --setup
     adb $ADBOPTS push $SOURCE/tests/autopilot /home/$DEVICE_USER/autopilot
     adb $ADBOPTS shell chown -R "$DEVICE_USER":"$DEVICE_USER" /home/$DEVICE_USER/autopilot
     set +e

=== modified file 'phablet-click-test-setup'
--- phablet-click-test-setup	2014-02-20 13:39:04 +0000
+++ phablet-click-test-setup	2014-02-20 13:39:04 +0000
@@ -101,6 +101,13 @@
                         help='User on device to use')
     parser.add_argument('--wipe', action='store_true',
                         help='Clean up previous setup on device')
+    base = parser.add_mutually_exclusive_group()
+    base.add_argument('--skip-base', action='store_true',
+                      help='''Skips the base setup such as installation of
+                              emulators and autopilot.''')
+    base.add_argument('--only-base', action='store_true',
+                      help='''Only sets up the base for testing such as the
+                              emulators and autopilot.''')
     return parser.parse_args()
 
 
@@ -223,8 +230,14 @@
     test_dir = tempfile.mkdtemp()
     os.mkdir(os.path.join(test_dir, py2_subdir))
     atexit.register(cleanup, test_dir)
-    fetch_test_base(adb, test_dir)
-    fetch_click_tests(adb, test_dir, args.user, args.click)
+    if args.wipe and args.skip_base:
+        print('Ignoring request to skip base provisioning as wipe was also '
+              'requested')
+        args.skip_base = False
+    if not args.skip_base:
+        fetch_test_base(adb, test_dir)
+    if not args.only_base:
+        fetch_click_tests(adb, test_dir, args.user, args.click)
     destination = path.join('/home', args.user, 'autopilot')
     if args.wipe:
         print('Clearing previous test setup in %s' % destination)

=== modified file 'phablet-config'
--- phablet-config	2013-12-12 23:45:16 +0000
+++ phablet-config	2014-02-20 13:39:04 +0000
@@ -104,8 +104,15 @@
     if args.dbus_probe == 'enable':
         rfile = '/usr/share/autopilot-touch/apparmor/click.rules'
         adb.shell('aa-clickhook -f --include=%s' % rfile)
-    else:
+    elif args.dbus_probe == 'disable':
         adb.shell('aa-clickhook -f')
+    elif args.setup:
+        # TODO replace with better implementation, phablet-click-test-setup
+        # scheduled to depart
+        subprocess.check_call(['phablet-click-test-setup', '--only-base'])
+    else:
+        print('Use --help for additional information')
+        exit(1)
 
 
 def _handle_writable_image(adb, args):
@@ -213,9 +220,11 @@
 
     ap = sub.add_parser('autopilot', help='Configure autopilot for device.')
     ap.add_argument('--dbus-probe', choices=('enable', 'disable'),
-                    required=True,
+                    default='None',
                     help='''Allows autopilot the ability to introspect DBUS
                          objects so that tests will work.''')
+    ap.add_argument('--setup', action='store_true',
+                    help='''Sets up autopilot (not yet) and it's emulators''')
     ap.set_defaults(func=_handle_autopilot)
     dm = sub.add_parser('writable-image', help='''Enable read/write access to
                         device partitions  and optionally install extra