Merge lp:~barry/ubuntu-ota-tests/packaging into lp:ubuntu-ota-tests

[Barry Warsaw]

Packaged ubuntu-ota-tests.

This refactors the test support code into a normal Debian native package, so that it can be depended on and re-used by other packages.

Note that currently there's a dependency on python3-autopilot, which pulls in a ton of stuff, but I think we talked about getting rid of that dependency. I'll leave that for another branch.

This also adds some code so that it should work with either system-image 2.5 or 3.0. When the latter lands in vivid, we should remove or deprecate the 2.5 support.

[Leo Arias (elopio)]

This is great. We just need to remove the cd debian/tests from the tests, and then we will be able to run the tests with -B --unbuilt-tree.

After fixing that, consider this my approval.

Thanks barry.

[Barry Warsaw (barry)]

Fixed! Thanks.

[Barry Warsaw (barry)]

Oops, conflicts with trunk. I'll fix those.

[Leo Arias (elopio)]

Sorry, I left my approval in the wrong place.

review: Approve

[Christopher Lee (veebers)]

I think the readme should say '-B --unbuilt-tree=.' without the -B the build on the device fails for me if the archives are out of date (i.e. need to apt-get update on the device).

Other than that this is looking good. If my complaint above can be addressed (either by clarifying and it stays that way or it changes) then this is an approve from me.

review: Needs Information

[Christopher Lee (veebers)]

LGTM, readme can be fixed later.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~barry/ubuntu-ota-tests/packaging/+merge/253357/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2015-03-18 19:58:13 +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:58:13 +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:58:13 +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:58:13 +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:58:13 +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:58:13 +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:58:13 +0000
@@ -1,17 +1,17 @@
-Tests: ota_selftests
+Tests: ota-selftests
 Restrictions: allow-stderr
 Depends: python3-autopilot,
          python3-coverage,
          python3-psutil,
          system-image-dbus
 
-Test-Command: cd debian/tests; python3 -m unittest ubuntu_ota_tests.tests.test_basic_upgrade
+Test-Command: python3 -m unittest ubuntu_ota_tests.tests.test_basic_upgrade
 Restrictions: needs-root allow-stderr
 Depends: python3-autopilot,
          python3-psutil,
          system-image-cli
 
-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'
--- debian/tests/ota_selftests	2015-03-16 14:24:25 +0000
+++ debian/tests/ota-selftests	2015-03-18 19:58:13 +0000
@@ -20,8 +20,6 @@
 
 set -e
 
-cd debian/tests
-
 python3-coverage run --include=./ubuntu_ota_tests/* --omit=./ubuntu_ota_tests/selftests/*,./ubuntu_ota_tests/__init__.py -m unittest discover -v ubuntu_ota_tests.selftests
 
 mkdir -p $ADT_ARTIFACTS/coverage && python3-coverage report -m > $ADT_ARTIFACTS/coverage/report.txt

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2015-03-18 19:58:13 +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:58:13 +0000
@@ -19,17 +19,24 @@
 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
+
 
 
 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
@@ -54,6 +61,9 @@
             log.exception('reboot command output: {}'.format(error.output))
             raise
 
+    # 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."""
         with open('/run/adt_reboot_target', 'w') as reboot_target:

=== 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:58:13 +0000
@@ -35,6 +35,7 @@
     'is_available downloading available_version update_size '
     'last_update_date error_reason')
 RebootingRecord = namedtuple('RebootingRecord', 'status')
+AppliedRecord = namedtuple('AppliedRecord', 'status')
 DownloadRecord = namedtuple(
     'DownloadRecord', 'downloaded percentage paused failed')
 
@@ -66,12 +67,15 @@
 
 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))
         self.quit()
 
+    def _do_Applied(self, signal, path, *args):
+        self.signals.append(AppliedRecord(*args))
+
 
 class DownloadReactor(BaseReactor):