Merge lp:~canonical-platform-qa/ubuntu-ota-tests/wait-for-download into lp:ubuntu-ota-tests

[Richard Huddie]

Add a download reactor class and service methods with some tests

Add a download reactor class and service methods with some tests. The tests rely on there being a suitable update to download.

[Barry Warsaw (barry)]

Merge conflicts

review: Needs Fixing

[Christopher Lee (veebers)]

Looking good, some questions and one fix inline with the code.

review: Needs Fixing

[Richard Huddie (rhuddie)]

Thanks Chris, I have made those updates.

[Barry Warsaw (barry)]

LGTM

review: Approve

[Christopher Lee (veebers)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/ubuntu-ota-tests-autolanding/10/
Executed test runs:

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ota-tests-autolanding/11/
Executed test runs:

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ota-tests-autolanding/12/
Executed test runs:

review: Needs Fixing (continuous-integration)

[Christopher Lee (veebers)]

I resubmitted this to show up the merge conflicts that are apparently stopping the automerge.

[lp:~canonical-platform-qa/ubuntu-ota-tests/wait-for-download]

43. By Richard Huddie on 2015-03-18

Merge from parent branch.

44. By Richard Huddie on 2015-03-18

Updates required for CheckForUpdateReactor changes.

45. By Richard Huddie on 2015-03-18

Skip download test if no download available.

Unmerged revisions

=== modified file 'debian/tests/ubuntu_ota_tests/reactors.py'
--- debian/tests/ubuntu_ota_tests/reactors.py	2015-03-17 14:22:33 +0000
+++ debian/tests/ubuntu_ota_tests/reactors.py	2015-03-17 14:22:33 +0000
@@ -18,7 +18,8 @@
 
 __all__ = [
     'CheckForUpdateReactor',
-    'ApplyUpdateReactor'
+    'ApplyUpdateReactor',
+    'DownloadReactor'
     ]
 
 
@@ -34,6 +35,8 @@
     'is_available downloading available_version update_size '
     'last_update_date error_reason')
 RebootingRecord = namedtuple('RebootingRecord', 'status')
+DownloadRecord = namedtuple(
+    'DownloadRecord', 'downloaded percentage paused failed')
 
 
 class BaseReactor(Reactor):
@@ -68,3 +71,32 @@
     def _do_Rebooting(self, signal, path, *args):
         self.signals.append(RebootingRecord(*args))
         self.quit()
+
+
+class DownloadReactor(BaseReactor):
+
+    def __init__(self, iface):
+        super().__init__(
+            iface.DownloadUpdate, 'UpdateDownloaded', 'UpdateProgress',
+            'UpdatePaused', 'UpdateFailed')
+
+    def _do_UpdateDownloaded(self, signal, path):
+        # No arguments passed to this method
+        self.signals.append(DownloadRecord(
+            downloaded=True, percentage=100, paused=False, failed=False))
+        self.quit()
+
+    def _do_UpdateProgress(self, signal, path, percentage, eta):
+        self.signals.append(DownloadRecord(
+            downloaded=False, percentage=percentage, paused=False,
+            failed=False))
+
+    def _do_UpdatePaused(self, signal, path, percentage):
+        self.signals.append(DownloadRecord(
+            downloaded=False, percentage=percentage, paused=True,
+            failed=False))
+
+    def _do_UpdateFailed(self, signal, path, *args):
+        self.signals.append(DownloadRecord(
+            downloaded=False, percentage=0, paused=False, failed=True))
+        self.quit()

=== modified file 'debian/tests/ubuntu_ota_tests/selftests/test_services.py'
--- debian/tests/ubuntu_ota_tests/selftests/test_services.py	2015-03-17 14:22:33 +0000
+++ debian/tests/ubuntu_ota_tests/selftests/test_services.py	2015-03-17 14:22:33 +0000
@@ -68,3 +68,25 @@
 
         self.assertEqual(len(result), 1)
         self.assertFalse(result[0].status)
+
+    def is_update_available(self):
+        """Check if an update is available.
+        :return: True is available, False otherwise."""
+        signals = services.check_for_update()
+        self.assertEqual(len(signals), 1)
+        return signals[0].is_available
+
+    def validate_successful_download(self, record):
+        """Validate a successful download record"""
+        self.assertTrue(record.downloaded)
+        self.assertFalse(record.failed)
+        self.assertFalse(record.paused)
+        self.assertEqual(record.percentage, 100)
+
+    def test_download_update(self):
+        sys_image_iface = services.get_system_image_interface()
+        self.assertEqual(sys_image_iface.CancelUpdate(), '')
+        self.assertTrue(self.is_update_available())
+        signals = services.download_update()
+        # validate that last record was a successful download signal
+        self.validate_successful_download(signals[-1])

=== modified file 'debian/tests/ubuntu_ota_tests/services.py'
--- debian/tests/ubuntu_ota_tests/services.py	2015-03-17 14:22:33 +0000
+++ debian/tests/ubuntu_ota_tests/services.py	2015-03-17 14:22:33 +0000
@@ -25,6 +25,7 @@
 
 from ubuntu_ota_tests import system
 from ubuntu_ota_tests.reactors import ApplyUpdateReactor
+from ubuntu_ota_tests.reactors import DownloadReactor
 from ubuntu_ota_tests.reactors import CheckForUpdateReactor
 
 
@@ -158,3 +159,11 @@
     sys_image_iface = get_system_image_interface()
     reactor = ApplyUpdateReactor(sys_image_iface)
     return reactor.run()
+
+
+def download_update(timeout=300):
+    """Call DownloadUpdate dbus method and wait for UpdateDownloaded signal.
+    :return: List of received signals"""
+    sys_image_iface = get_system_image_interface()
+    reactor = DownloadReactor(sys_image_iface)
+    return reactor.run(timeout=timeout)