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

[Leo Arias]

Just a quick hack to give this idea a try. It sounds wrong to me to have changed the revert command, but I still haven't found to make a separate revert-full-system.

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

9. By Leo Arias on 2015-03-17

Make it verbose.

10. By Leo Arias on 2015-03-17

Fixed the verbosity.

11. By Leo Arias on 2015-03-17

Added a wait for the phone to boot.

12. By Leo Arias on 2015-03-17

Added an extra sleep.

Unmerged revisions

12. By Leo Arias on 2015-03-17

Added an extra sleep.

11. By Leo Arias on 2015-03-17

Added a wait for the phone to boot.

10. By Leo Arias on 2015-03-17

Fixed the verbosity.

9. By Leo Arias on 2015-03-17

Make it verbose.

8. By Leo Arias on 2015-03-17

First attempt at reflashing between tests.

=== modified file 'adb-reboot-to-recovery'
--- adb-reboot-to-recovery	2015-03-09 20:05:44 +0000
+++ adb-reboot-to-recovery	2015-03-17 05:04:15 +0000
@@ -43,7 +43,7 @@
 
 SSH_USER=phablet
 SUDO_PASSWORD=
-CAPABILITIES='isolation-machine reboot'
+CAPABILITIES='isolation-machine reboot revert revert-full-system'
 
 # allow using lp:phablet-tools from a checkout
 if [ -n "$PHABLET_TOOLS_PATH" ]; then
@@ -234,9 +234,13 @@
     # save current network connections
     NETCONF=$(phablet-config $ADBOPTS network --read) || true:
 
-    # do factory reset
-    adb $ADBOPTS shell 'gdbus call --system -d com.canonical.SystemImage -o /Service -m com.canonical.SystemImage.FactoryReset'
+    # reflash the device to the original version.
+    ubuntu-device-flash -v --revision=-1 touch --developer-mode --password 0000 --channel="ubuntu-touch/devel-proposed" --wipe
+
+    # give some time for the phone to start rebooting.
+    sleep 10
     wait_booted
+
     adb $ADBOPTS shell 'while ! pidof NetworkManager >/dev/null; do sleep 1; done'
 
     # restore network connections

=== modified file 'debian/tests/control'
--- debian/tests/control	2015-03-12 21:54:50 +0000
+++ debian/tests/control	2015-03-17 05:04:15 +0000
@@ -6,9 +6,10 @@
          system-image-dbus
 
 Test-Command: cd debian/tests; python3 -m unittest ubuntu_ota_tests.tests.test_basic_upgrade
-Restrictions: needs-root allow-stderr
+Restrictions: needs-root allow-stderr breaks-testbed
 Depends: python3-autopilot,
          python3-psutil,
+<<<<<<< TREE
          system-image-cli
 
 Tests: check_for_update
@@ -17,3 +18,6 @@
          ubuntu-download-manager,
          dbus, dbus-x11,
          python3-psutil, python3-xdg, python3-setuptools, python3-nose2
+=======
+         system-image-cli
+>>>>>>> MERGE-SOURCE