Merge lp:~mterry/phablet-tools/welcome-wizard-disable into lp:phablet-tools

[Michael Terry]

Add support for "phablet-config welcome-wizard --enable" or "phablet-config welcome-wizard --disable". Note that you'll need ubuntu-system-settings-wizard installed for this to mean anything.

Add support for "phablet-config welcome-wizard --enable" or "phablet-config welcome-wizard --disable". Note that you'll need ubuntu-system-settings-wizard installed for this to mean anything.

I also edited the bootchart script to disable the wizard.

[lp:~mterry/phablet-tools/welcome-wizard-disable]

286. By Michael Terry on 2014-06-19

Bump version so other packages can depend on this one for welcome-wizard argument

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:285
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/342/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/23/console

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/phablet-tools/welcome-wizard-disable]

287. By Michael Terry on 2014-06-19

fix typo

288. By Michael Terry on 2014-06-19

Fix pep8 line being too long

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:288
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/343/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/24

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

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

I discussed this with the CI team and we don't have any comments on the actual code changes, just some questions on some possible implications:

1) Is this a no-op if ubuntu-system-settings-wizard is not available? I'm just making sure this change doesn't need to be in lock-step with some other change.

2) Are there cases when we don't want to disable this wizard? I can see that for all of our current testing this is needed. Do we have a testing gap for this wizard that we eventually need to cover?

3) Just to make a note, it would be helpful to have a single option which disabled both the intro and the welcome-wizard and could be used as an umbrella option for any other tweak that needs to be done before automated tests can run. But I can see this being outside the scope of this MP and don't want to bog this one down.

review: Needs Information

[Michael Terry (mterry)]

1) Is this a no-op if ubuntu-system-settings-wizard is not available? I'm just making sure this change doesn't need to be in lock-step with some other change.

- Yes, it's a no-op. Just adds/removes a file that only the wizard looks at.

2) Are there cases when we don't want to disable this wizard? I can see that for all of our current testing this is needed. Do we have a testing gap for this wizard that we eventually need to cover?

- Maybe? I think for AP tests, we can just add/remove the file in the AP test and restart the upstart job with testability. So it should be fine that for all our current testing we disable it.

3) Just to make a note, it would be helpful to have a single option which disabled both the intro and the welcome-wizard and could be used as an umbrella option for any other tweak that needs to be done before automated tests can run. But I can see this being outside the scope of this MP and don't want to bog this one down.

- Agreed on all points.

[Francis Ginther (fginther)]

Thanks for the responses, this all looks reasonable.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-16 19:16:47 +0000
+++ debian/changelog	2014-06-19 15:10:26 +0000
@@ -1,3 +1,11 @@
+phablet-tools (1.1) UNRELEASED; urgency=medium
+
+  * phablet-config: Add support for "welcome-wizard --enable" or
+    "welcome-wizard --disable". Note that you'll need
+     ubuntu-system-settings-wizard installed for this to mean anything.
+
+ -- Michael Terry <[e-mail]>  Thu, 19 Jun 2014 11:02:03 -0400
+
 phablet-tools (1.0+14.10.20140616-0ubuntu1) utopic; urgency=low
 
   [ Oliver Grawert ]

=== modified file 'phablet-bootchart'
--- phablet-bootchart	2014-04-14 17:06:36 +0000
+++ phablet-bootchart	2014-06-19 15:10:26 +0000
@@ -119,9 +119,13 @@
 	ERROR="could not install bootchart package" exit 1
 reboot_and_wait 30
 
+echo "Disabling Welcome Wizard"
+phablet-config welcome-wizard --disable || \
+	ERROR="could not disable welcome wizard" exit 1
+
 echo "Disabling Intro Demo"
 phablet-config edges-intro --disable || \
-	ERROR="could disable intro" exit 1
+	ERROR="could not disable intro" exit 1
 
 echo "Rebooting three times to get accurate data"
 reboot_and_wait 60

=== modified file 'phablet-config'
--- phablet-config	2013-12-12 23:45:16 +0000
+++ phablet-config	2014-06-19 15:10:26 +0000
@@ -190,6 +190,22 @@
         adb.shell(setter)
 
 
+def _handle_welcome_wizard(adb, args):
+    config_dir = '/home/phablet/.config/ubuntu-system-settings'
+    ran_file = config_dir + '/wizard-has-run'
+
+    enabled = adb.shell('ls %s' % ran_file).strip() != ran_file
+    if args.enable and enabled:
+        print('already enabled')
+    elif not args.enable and not enabled:
+        print('already disabled')
+    elif args.enable:
+        adb.shell('rm %s' % ran_file)
+    else:
+        adb.shell('sudo -u phablet mkdir -p %s' % config_dir)
+        adb.shell('sudo -u phablet touch %s' % ran_file)
+
+
 def parse_arguments():
     parser = argparse.ArgumentParser(
         description='Set up different configuration options on a device.')
@@ -236,6 +252,15 @@
                     help='enable edges intro')
     ei.add_argument('--disable', action='store_false', required=False,
                     help='disable edges intro')
+
+    ei = sub.add_parser('welcome-wizard',
+                        help='Enable/disable the welcome wizard.')
+    ei.set_defaults(func=_handle_welcome_wizard)
+    ei = ei.add_mutually_exclusive_group(required=True)
+    ei.add_argument('--enable', action='store_true', required=False,
+                    help='enable welcome wizard')
+    ei.add_argument('--disable', action='store_false', required=False,
+                    help='disable welcome wizard')
     return parser.parse_args()