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

[Leo Arias]

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

39. By Leo Arias on 2015-03-17

Removed the exit before the apply.

40. By Leo Arias on 2015-03-18

Check for update.

41. By Leo Arias on 2015-03-18

Merged with trunk. Added the download.

42. By Leo Arias on 2015-03-18

Disabled auto download.

43. By Leo Arias on 2015-03-18

Merged with prerequisite.

44. By Leo Arias on 2015-03-18

Added the missing quit.

45. By Leo Arias on 2015-03-18

Added the applied handler.

46. By Leo Arias on 2015-03-18

Do not cd into debian/tests

47. By Leo Arias on 2015-03-18

take into account when the python path is not set.

48. By Leo Arias on 2015-03-18

Use cli for system image 2.5.

49. By Leo Arias on 2015-03-19

Cleaned the test.

50. By Leo Arias on 2015-03-19

Merged with prerequisite.

51. By Leo Arias on 2015-03-19

We no longer require 3.0.

52. By Leo Arias on 2015-03-19

Removed the duplicated vars.

53. By Leo Arias on 2015-03-19

Fixed the reqs.

54. By Leo Arias on 2015-03-19

Try to upgrade with dbus in 3.0, use cli in 2.5

55. By Leo Arias on 2015-03-19

Moved the check to the upgrade.

56. By Leo Arias on 2015-03-19

Added the quit on the applied reactor.

57. By Federico Gimenez on 2015-03-23

Fixes from review; added ota-dbus-upgrade test with temporary workarounds for si 3.0; apply noop selftest skipped if there's a upgrade available (wouldn't be a noop)

58. By Federico Gimenez on 2015-03-23

test file

59. By Federico Gimenez on 2015-03-23

moved si 3.0 setup to adt-run

60. By Federico Gimenez on 2015-03-24

Added sleep after Popen call; changed suggested adt-run command to not copy the system-image cfg files once copied the first time

61. By Federico Gimenez on 2015-03-24

comment about sleep for Popen

62. By Federico Gimenez on 2015-03-25

merged trunk

63. By Federico Gimenez on 2015-03-25

Copying config files to custom config directory

64. By Federico Gimenez on 2015-03-25

skip test_check_update if there is an update available

65. By Federico Gimenez on 2015-03-25

Disabled upgrade assertion for subtask

66. By Federico Gimenez on 2015-03-26

Added bug references for test command comment and the required fix for apply upgrade

67. By Federico Gimenez on 2015-03-26

flake8

68. By Federico Gimenez on 2015-03-26

Better log message

Unmerged revisions

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2015-03-18 19:13:46 +0000
@@ -0,0 +1,2 @@
+ubuntu_ota_tests.egg-info
+dist

=== modified file 'README.rst'
--- README.rst	2015-03-11 16:31:35 +0000
+++ README.rst	2015-03-18 19:13:46 +0000
@@ -2,6 +2,6 @@
 
 The included example test can be run like so::
 
-  adt-run -B --unbuilt-tree=. --- ssh -s adb
+  adt-run --unbuilt-tree=. --- ssh -s adb
 
 All this example does is run and exits 0.

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-03 01:59:45 +0000
+++ debian/changelog	2015-03-18 19:13:46 +0000
@@ -1,4 +1,4 @@
-ubuntu-ota-tests (1.0-1) UNRELEASED; urgency=medium
+ubuntu-ota-tests (1.0) UNRELEASED; urgency=medium
 
   * Initial release.
 

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2015-03-18 19:13:46 +0000
@@ -0,0 +1,1 @@
+9

=== modified file 'debian/control'
--- debian/control	2015-03-08 17:34:00 +0000
+++ debian/control	2015-03-18 19:13:46 +0000
@@ -1,1 +1,24 @@
+Source: ubuntu-ota-tests
+Maintainer: QA Team <[e-mail]>
 Homepage: http://launchpad.net/ubuntu-ota-tests
+Section: python
+X-Python3-Version: >= 3.4
+Priority: optional
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python3-all (>= 3.3),
+               python3-setuptools
+Standards-Version: 3.9.6
+XS-Testsuite: autopkgtest
+Vcs-Bzr: https://code.launchpad.net/~canonical-platform-qa/ubuntu-ota-tests/trunk
+Vcs-Browser: http://bazaar.launchpad.net/~canonical-platform-qa/ubuntu-ota-tests/trunk/files
+
+Package: python3-ubuntu-ota-tests
+Architecture: all
+Depends: python3-autopilot,
+         system-image-common,
+         ${misc:Depends},
+         ${python3:Depends}
+Description: support for OTA tests
+ This package provides a Python 3 library that can be used as a DEP-8
+ dependency for testing OTA upgrades.

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2015-03-18 19:13:46 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+DH_VERBOSE=1
+#DEB_BUILD_OPTIONS=nocheck
+
+%:
+	dh $@ --with python3 --buildsystem=pybuild
+
+# To avoid circular Build-Depends, do not run the package's test suite at
+# build time.  Instead, they will get run via DEP-8.
+override_dh_auto_test:

=== renamed file 'debian/tests/check_for_update' => 'debian/tests/check-for-update'
=== modified file 'debian/tests/control'
--- debian/tests/control	2015-03-17 15:28:51 +0000
+++ debian/tests/control	2015-03-18 19:13:46 +0000
@@ -1,4 +1,4 @@
-Tests: ota_selftests
+Tests: ota-selftests
 Restrictions: allow-stderr
 Depends: python3-autopilot,
          python3-coverage,
@@ -9,9 +9,9 @@
 Restrictions: needs-root allow-stderr
 Depends: python3-autopilot,
          python3-psutil,
-         system-image-cli
+         system-image-dbus (>=3.0)
 
-Tests: check_for_update
+Tests: check-for-update
 Depends: system-image-common,
          system-image-dbus,
          ubuntu-download-manager,

=== renamed file 'debian/tests/ota_basic' => 'debian/tests/ota-basic'
=== renamed file 'debian/tests/ota_selftests' => 'debian/tests/ota-selftests'
=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2015-03-18 19:13:46 +0000
@@ -0,0 +1,30 @@
+#
+# 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 setuptools import find_packages, setup
+
+setup(
+    name='ubuntu-ota-tests',
+    version='1.0',
+    description='Ubuntu OTA tests',
+    author='Ubuntu QA Team',
+    author_email='[e-mail]',
+    license='GNU GPLv3',
+    packages=find_packages(),
+    include_package_data=True,
+    )

=== renamed directory 'debian/tests/ubuntu_ota_tests' => 'ubuntu_ota_tests'
=== modified file 'ubuntu_ota_tests/hooks.py'
--- debian/tests/ubuntu_ota_tests/hooks.py	2015-03-12 15:17:34 +0000
+++ ubuntu_ota_tests/hooks.py	2015-03-18 19:13:46 +0000
@@ -19,17 +19,25 @@
 import logging
 import subprocess
 
-from systemimage import reboot
+try:
+    # si 3.0
+    from systemimage.apply import BaseApply as Base
+except ImportError:
+    # si 2.5
+    from systemimage.reboot import BaseReboot as Base
+
+from systemimage.config import config
 
 
 log = logging.getLogger('systemimage')
 
 
-class ADTRebootToRecovery(reboot.BaseReboot):
+class ADTRebootToRecovery(Base):
 
     """Hook to be used during system image upgrade to apply the upgrade."""
 
-    def reboot(self):
+    # si 3.0
+    def apply(self):
         """Reboot the testbed to apply the upgrade.
 
         This method does not execute the reboot, it tells adt-run that the
@@ -53,6 +61,12 @@
             log.exception('reboot exit status: {}'.format(error.returncode))
             log.exception('reboot command output: {}'.format(error.output))
             raise
+        # This code may or may not run.  We're racing against the system
+        # reboot procedure.
+        config.dbus_service.Rebooting(True)
+
+    # si 2.5
+    reboot = apply
 
     def _set_adt_reboot_to_recovery_flag(self):
         """Set a flag to tell adt that the reboot needs to go into recovery."""

=== modified file 'ubuntu_ota_tests/reactors.py'
--- debian/tests/ubuntu_ota_tests/reactors.py	2015-03-17 11:52:35 +0000
+++ ubuntu_ota_tests/reactors.py	2015-03-18 19:13:46 +0000
@@ -35,9 +35,12 @@
     'is_available downloading available_version update_size '
     'last_update_date error_reason')
 RebootingRecord = namedtuple('RebootingRecord', 'status')
+
 DownloadRecord = namedtuple(
     'DownloadRecord', 'downloaded percentage paused failed')
 
+AppliedRecord = namedtuple('AppliedRecord', 'status')
+
 
 class BaseReactor(Reactor):
     def __init__(self, iface_method, *signals):
@@ -66,7 +69,7 @@
 
 class ApplyUpdateReactor(BaseReactor):
     def __init__(self, iface):
-        super().__init__(iface.ApplyUpdate, 'Rebooting')
+        super().__init__(iface.ApplyUpdate, 'Applied', 'Rebooting')
 
     def _do_Rebooting(self, signal, path, *args):
         self.signals.append(RebootingRecord(*args))
@@ -99,4 +102,7 @@
     def _do_UpdateFailed(self, signal, path, *args):
         self.signals.append(DownloadRecord(
             downloaded=False, percentage=0, paused=False, failed=True))
+
+    def _do_Applied(self, signal, path, *args):
+        self.signals.append(AppliedRecord(*args))
         self.quit()

=== modified file 'ubuntu_ota_tests/tests/test_basic_upgrade.py'
--- debian/tests/ubuntu_ota_tests/tests/test_basic_upgrade.py	2015-03-12 15:37:04 +0000
+++ ubuntu_ota_tests/tests/test_basic_upgrade.py	2015-03-18 19:13:46 +0000
@@ -27,8 +27,6 @@
     def test_basic_over_the_air_upgrade(self):
         rebooted_mark = os.environ.get('ADT_REBOOT_MARK', None)
         if not rebooted_mark:
-            # The upgrade with dbus needs more work, it's getting stuck.
-            # upgrade.upgrade_with_system_image_dbus()
-            upgrade.upgrade_with_system_image_cli()
+            upgrade.upgrade_with_system_image_dbus()
         else:
             print('Rebooted')

=== modified file 'ubuntu_ota_tests/upgrade.py'
--- debian/tests/ubuntu_ota_tests/upgrade.py	2015-03-10 21:46:22 +0000
+++ ubuntu_ota_tests/upgrade.py	2015-03-18 19:13:46 +0000
@@ -16,9 +16,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import os
 import subprocess
 
-from ubuntu_ota_tests import hooks
+import ubuntu_ota_tests
+from ubuntu_ota_tests import (
+    hooks,
+    services
+)
 
 
 def upgrade_with_system_image_cli():
@@ -26,3 +31,36 @@
     print('Upgrading with ' + command)
     subprocess.check_call(command.split())
     hooks.ADTRebootToRecovery().reboot()
+
+
+def upgrade_with_system_image_dbus():
+    os.environ['PYTHONPATH'] = (
+            os.environ.get('PYTHONPATH') +
+            os.path.dirname(ubuntu_ota_tests.__file__))
+    print(os.environ.get('PYTHONPATH'))
+    _write_adt_apply_config()
+    services.ensure_system_image_dbus_not_running()
+    command = 'system-image-dbus -v -C ' + _get_system_image_config_dir()
+    print('Starting system-images with ' + command)
+    subprocess.Popen(command.split())
+    services.set_auto_download(False)
+    print('Checking')
+    status = services.check_for_update()
+    if status.is_available:
+        print('Downloading')
+        services.download_update()
+        print('Applying')
+        services.apply_update()
+
+
+def _write_adt_apply_config():
+    config_path = _get_system_image_config_dir()
+    adt_apply_config_path = os.path.join(config_path, '01adt_apply.ini')
+    with open(adt_apply_config_path, 'w') as apply_config_file:
+        apply_config_file.write('[hooks]\n')
+        apply_config_file.write(
+            'apply: ubuntu_ota_tests.hooks.ADTRebootToRecovery')
+
+
+def _get_system_image_config_dir():
+    return os.environ.get('ADT_ARTIFACTS')