Merge lp:~canonical-platform-qa/ubuntu-ota-tests/create_online_accounts into lp:ubuntu-ota-tests

[Brendan Donegan]

Create online accounts, upgrade the system and then check they are still available

Create online accounts, upgrade the system and then check they are still available.

A quick explanation about the removing of __all__ from ubuntu_ota_tests/__init__.py, it was causing autopilot to be required as a dependency for the new test, even though that test is not an autopilot test, as it was importing unused files from ubuntu_ota_tests that imported autopilot.

[Federico Gimenez (fgimenez)]

Works fine, only a couple of issues inline.

Maybe we have already discussed this but could we check something more than the account provider (email or creds)?

Thanks,

review: Needs Fixing

[Richard Huddie (rhuddie)]

I ran this and it seemed to work fine. But should we also delete the account that was added, at the end of the test? I ran this a twice and there were 2 u1 accounts created on the device.

Thanks.

review: Needs Information

[lp:~canonical-platform-qa/ubuntu-ota-tests/create_online_accounts]

19. By Brendan Donegan on 2015-03-18

Fix review issues

[Brendan Donegan (brendan-donegan)]

> Works fine, only a couple of issues inline.
>
> Maybe we have already discussed this but could we check something more than
> the account provider (email or creds)?
>
> Thanks,

Both issues fixed, thanks

We could potentially but this goes far enough to catch the bug and it's really just meant to be an example of how to write such a test. Doing extra checks is a nice to have but not essential

[Brendan Donegan (brendan-donegan)]

> I ran this and it seemed to work fine. But should we also delete the account
> that was added, at the end of the test? I ran this a twice and there were 2 u1
> accounts created on the device.
>
> Thanks.

I fixed the inline comment - I specifically remember fixing that commenting out but it seems it didn't stick!

Although it's not marked as such at the moment these tests will probably be defined as breaks-testbed which will result in them re-imaging the device afterwards. So cleaning up the accounts would be redundant.

[lp:~canonical-platform-qa/ubuntu-ota-tests/create_online_accounts]

20. By Brendan Donegan on 2015-03-18

Restore check_for_update test

[Federico Gimenez (fgimenez)]

Thanks!

review: Approve

[Christopher Lee (veebers)]

NF comment in line, in the process of running locally will reply once run.

review: Needs Fixing

[lp:~canonical-platform-qa/ubuntu-ota-tests/create_online_accounts]

21. By Brendan Donegan on 2015-03-18

Run test_accounts_after_upgrade with Tests: instead of Test-Command:

[Leo Arias (elopio)]

I cleaned the basic test in https://code.launchpad.net/~canonical-platform-qa/ubuntu-ota-tests/dbus-upgrade/+merge/253423

You can write your test as a python test case following that style. Maybe even move the before_upgrade, upgrade and after_upgrade methods to a base class.

[Christopher Lee (veebers)]

With the change to the control file (using Tests: instead of Test-Command:) this change is needed due to the change in path where the execution happens:
http://paste.ubuntu.com/10625274/

review: Needs Fixing

[Leo Arias (elopio)]

> I cleaned the basic test in https://code.launchpad.net/~canonical-platform-qa
> /ubuntu-ota-tests/dbus-upgrade/+merge/253423
>
> You can write your test as a python test case following that style. Maybe even
> move the before_upgrade, upgrade and after_upgrade methods to a base class.

veebers has just told me that there are problems with making the test a python test case, so scracth what I said.

[lp:~canonical-platform-qa/ubuntu-ota-tests/create_online_accounts]

22. By Brendan Donegan on 2015-03-19

Specify full path to supporting scripts

23. By Brendan Donegan on 2015-03-19

Merged from trunk

24. By Brendan Donegan on 2015-03-31

Set PYTHONPATH when sudoing and use the right reboot mark name

25. By Brendan Donegan on 2015-03-31

Remove pdb's that were added£

[Brendan Donegan (brendan-donegan)]

Works now running locally. Ran it succesfully with run-ota-tests script

[Christopher Lee (veebers)]

Hmm, I tried running just the test using the command that the run-ota-test would use and it failed to run the test.

Command: adt-run -B --testname check_for_update --unbuilt-tree=/home/leecj2/code/u-ota-t/MPs/create_online_accounts --output-dir /tmp/otatests-170638/check_for_update --setup-commands='nmcli device wifi connect Defcon02 password <password> 2>/dev/null || true' --timeout-test=600 --- ssh -s adb -- -p 0000

The error is:
  chmod: cannot access ‘/tmp/adt-run.PXBASa/build.bo2/real-tree/debian/tests/check_for_update’: No such file or directory

I believe that this is due to it being called 'check-for-update' in the control file and the script name being called 'check_for_update'

Can you confirm that the test runs for you?

review: Needs Information

[lp:~canonical-platform-qa/ubuntu-ota-tests/create_online_accounts]

26. By Brendan Donegan on 2015-04-01

Fix name of check for updates test

[Brendan Donegan (brendan-donegan)]

Looks like that got changed accidentally when I merged. Thanks for catching it. Fixed

[Christopher Lee (veebers)]

To get this test to run just by itself I needed to add python3-autopilot to it's depends.

After adding that the test runs as expected and passes.

Once that dep is added to the Depends this turns into an approve :-)

review: Needs Fixing

[Brendan Donegan (brendan-donegan)]

> To get this test to run just by itself I needed to add python3-autopilot to
> it's depends.
>
> After adding that the test runs as expected and passes.
>
> Once that dep is added to the Depends this turns into an approve :-)

That's odd I see it right there in the Depends: section - what am I missing here?

[Christopher Lee (veebers)]

Heh, sorry my bad I was looking at the wrong test.
After testing the right one it all passes for me :-) LGTM

review: Approve

[Richard Huddie (rhuddie)]

I re-tested this and it works fine, so approve.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/tests/check_accounts_exist' (properties changed: -x to +x)
=== modified file 'debian/tests/control'
--- debian/tests/control	2015-03-23 12:18:58 +0000
+++ debian/tests/control	2015-04-01 07:54:48 +0000
@@ -13,6 +13,12 @@
          system-image-common,
          system-image-dbus
 
+Tests: ota-test_accounts_after_upgrade
+Restrictions: allow-stderr
+Depends: python3-autopilot,
+         unity-scope-click-autopilot,
+         system-image-cli
+
 Tests: check-for-update
 Depends: system-image-common,
          system-image-dbus,

=== added file 'debian/tests/create_u1_account'
--- debian/tests/create_u1_account	1970-01-01 00:00:00 +0000
+++ debian/tests/create_u1_account	2015-04-01 07:54:48 +0000
@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+#
+# Ubuntu OTA Tests
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+import sys
+
+from unityclickscope import credentials
+
+
+DUMMY_EMAIL = '[e-mail]'
+DUMMY_CREDS = ('name=Ubuntu+One+%40+bollo&'
+               'consumer_secret=*********&'
+               'token=**************&'
+               'consumer_key=*******&'
+               'token_secret=************')
+
+def main():
+    account_manager = credentials.AccountManager()
+    account_manager.add_u1_credentials(DUMMY_EMAIL, DUMMY_CREDS)
+
+if __name__ == "__main__":
+    sys.exit(main())

=== added file 'debian/tests/ota-test_accounts_after_upgrade'
--- debian/tests/ota-test_accounts_after_upgrade	1970-01-01 00:00:00 +0000
+++ debian/tests/ota-test_accounts_after_upgrade	2015-04-01 07:54:48 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+case "$ADT_REBOOT_MARK" in
+    "") echo "Creating accounts before upgrade";
+        ./debian/tests/create_u1_account;
+        export SUDO_ASKPASS=`ls /tmp/sudo_askpass.* | head -n1`;
+        sudo -A PYTHONPATH=$PYTHONPATH ./debian/tests/reboot_to_recovery ;;
+    rebooted) echo "Checking accounts after upgrade";
+          ./debian/tests/check_accounts_exist ubuntuone ;;
+esac

=== added file 'debian/tests/reboot_to_recovery'
--- debian/tests/reboot_to_recovery	1970-01-01 00:00:00 +0000
+++ debian/tests/reboot_to_recovery	2015-04-01 07:54:48 +0000
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+#
+# Ubuntu OTA Tests
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+from ubuntu_ota_tests import upgrade
+
+
+def main():
+    upgrade.upgrade_with_system_image_cli()
+
+if __name__ == "__main__":
+    main()

=== modified file 'ubuntu_ota_tests/__init__.py'
--- ubuntu_ota_tests/__init__.py	2015-03-10 06:54:40 +0000
+++ ubuntu_ota_tests/__init__.py	2015-04-01 07:54:48 +0000
@@ -15,17 +15,3 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-from ubuntu_ota_tests import (
-    hooks,
-    services,
-    system,
-    upgrade,
-)
-
-__all__ = [
-    'hooks',
-    'services',
-    'system',
-    'upgrade',
-]