Merge lp:~didrocks/ubuntu-system-image/small-modifs into lp:~barry/ubuntu-system-image/lp1212781

[Didier Roche-Tolomelli]

Misc mock issues fixes

[lp:~didrocks/ubuntu-system-image/small-modifs]

159. By Didier Roche-Tolomelli on 2013-08-22

no GetSetting/SetSetting needed

160. By Didier Roche-Tolomelli on 2013-08-22

comment is deprecated

161. By Didier Roche-Tolomelli on 2013-08-22

support version as a string instead of an int

162. By Didier Roche-Tolomelli on 2013-08-22

emit a SettingChanged signal if a setting key changed

[Barry Warsaw (barry)]

Thanks for the fixes and changes!

LP: #1215586 tracks the support for the array-of-dictionaries data type. I'll leave these commented out in my branch for now, so please resolve that issue when the u/i can handle this and I'll re-enable it in the client.

I fixed all the tests.

I had to restore the Reset method; it's used by the test suite due to peculiarities in the way the dbus service is launched through the testing infrastructure.

review: Approve

=== modified file 'systemimage/bindings.py'
--- systemimage/bindings.py	2013-08-01 22:52:44 +0000
+++ systemimage/bindings.py	2013-08-22 16:02:46 +0000
@@ -95,7 +95,7 @@
 
     @property
     def update_version(self):
-        return int(self.iface.GetUpdateVersion())
+        return str(self.iface.GetUpdateVersion())
 
     @property
     def update_descriptions(self):

=== modified file 'systemimage/dbus.py'
--- systemimage/dbus.py	2013-08-22 02:33:05 +0000
+++ systemimage/dbus.py	2013-08-22 16:02:46 +0000
@@ -61,7 +61,7 @@
                                    self._update.version,
                                    self._update.size,
                                    self._update.last_update_date,
-                                   self._update.descriptions,
+                                   #self._update.descriptions,
                                    "")
         self._checking = False
         # Stop GLib from calling this method again.
@@ -122,7 +122,14 @@
         GLib.timeout_add(50, self._download)
 
     @method('com.canonical.SystemImage')
-    def Cancel(self):
+    def PauseDownload(self, out_signature='s'):
+        """Pause a downloading update.
+
+        TODO: complete"""
+        return ""
+
+    @method('com.canonical.SystemImage')
+    def CancelUpdate(self, out_signature='s'):
         """Cancel a download and/or reboot.
 
         At any time between the `GetUpdate()` call and the `Reboot()` call, an
@@ -134,6 +141,8 @@
         """
         self._api.cancel()
         self.Canceled()
+        # TODO: if can't cancel the current download, return the reason in this string
+        return ""
 
     @method('com.canonical.SystemImage')
     def Exit(self):
@@ -148,11 +157,12 @@
         self._api.reboot()
         return ''
 
-    @signal('com.canonical.SystemImage', signature='bbiisaa{ss}s')
+    #@signal('com.canonical.SystemImage', signature='bbiisaa{ss}s')
+    @signal('com.canonical.SystemImage', signature='bbsiss')
     def UpdateAvailableStatus(self,
                               is_available, downloading,
                               available_version, update_size,
-                              last_update_date, descriptions,
+                              last_update_date, #descriptions,
                               error_reason):
         """Signal sent in response to a CheckForUpdate()."""
 
@@ -172,6 +182,7 @@
     def UpdatePaused(self, percentage):
         """The download got paused."""
 
+    # TODO: remove
     @signal('com.canonical.SystemImage')
     def Canceled(self):
         """A download has been canceled.
@@ -202,9 +213,16 @@
                 return
             if as_int not in (0, 1, 2):
                 return
+        if value == self.GetSetting(key):
+            return
         Settings().set(key, value)
+        self.SettingChanged(key, value)
 
     @method('com.canonical.SystemImage', in_signature='s', out_signature='s')
     def GetSetting(self, key):
         """Get a setting."""
         return Settings().get(key)
+
+    @signal('com.canonical.SystemImage', signature='ss')
+    def SettingChanged(self, key, new_value):
+        """A settings key has change"""

=== modified file 'systemimage/testing/dbus.py'
--- systemimage/testing/dbus.py	2013-08-22 02:54:38 +0000
+++ systemimage/testing/dbus.py	2013-08-22 16:02:46 +0000
@@ -88,10 +88,6 @@
         super().__init__(bus, object_path, loop)
         self._reset()
 
-    @method('com.canonical.SystemImage')
-    def Reset(self):
-        self._reset()
-
     def _reset(self):
         self._percentage = 0
         self._eta = 50.0
@@ -109,21 +105,25 @@
 
     def _send_status(self):
         self.UpdateAvailableStatus(
-            True, self._auto_download, 42, 1337 * 1024 * 1024,
+            True, self._auto_download, '42', 1337 * 1024 * 1024,
             '1983-09-13T12:13:14',
-            [
-            {'description': 'Ubuntu Edge support',
-             'description-en_GB': 'change the background colour',
-             'description-fr': "Support d'Ubuntu Edge",
-            },
-            {'description':
-             'Flipped container with 200% boot speed improvement',
-            }],
+            #[
+            #{'description': 'Ubuntu Edge support',
+            # 'description-en_GB': 'change the background colour',
+            # 'description-fr': "Support d'Ubuntu Edge",
+            #},
+            #{'description':
+            # 'Flipped container with 200% boot speed improvement',
+            #"}],
             '')
-        if self._auto_download:
+        if self._auto_download and not self._downloading and not self._rebootable:
             self._downloading = True
             self.UpdateProgress(0, 50.0)
             GLib.timeout_add(500, self._send_more_status)
+        if self._paused:
+            self.UpdatePaused(self._percentage)
+        if self._rebootable:
+            self.UpdateDownloaded()
         return False
 
     def _send_more_status(self):
@@ -138,6 +138,7 @@
             if self._percentage == 100:
                 # We're done.
                 self._downloading = False
+                self._rebootable = True
                 self.UpdateDownloaded()
                 return False
             self.UpdateProgress(self._percentage, self._eta)
@@ -161,7 +162,7 @@
                 self.UpdateProgress(0, 50.0)
                 GLib.timeout_add(500, self._send_more_status)
 
-    @method('com.canonical.SystemImage', signature='s')
+    @method('com.canonical.SystemImage', out_signature='s')
     def CancelUpdate(self):
         if self._downloading:
             self._canceled = True
@@ -183,32 +184,33 @@
 class _UpdateFailed(Service):
     def __init__(self, bus, object_path, loop):
         super().__init__(bus, object_path, loop)
-        self._reset()
-
-    @method('com.canonical.SystemImage')
-    def Reset(self):
-        self._reset()
-
-    def _reset(self):
         self._failure_count = 1
 
     @method('com.canonical.SystemImage')
     def CheckForUpdate(self):
-        msg = 'You need some network for downloading'
+        msg = ''
+        if self._failure_count > 0:
+            msg = 'You need some network for downloading'
         self.UpdateAvailableStatus(
-            True, False, 42, 1337 * 1024 * 1024,
+            True, False, '42', 1337 * 1024 * 1024,
             '1983-09-13T12:13:14',
-            [
-            {'description': 'Ubuntu Edge support',
-             'description-en_GB': 'change the background colour',
-             'description-fr': "Support d'Ubuntu Edge",
-            },
-            {'description':
-             'Flipped container with 200% boot speed improvement',
-            }],
+            #[
+            #{'description': 'Ubuntu Edge support',
+            # 'description-en_GB': 'change the background colour',
+            # 'description-fr': "Support d'Ubuntu Edge",
+            #},
+            #{'description':
+            # 'Flipped container with 200% boot speed improvement',
+            #}],
             msg)
-        self._failure_count += 1
-        self.UpdateFailed(self._failure_count, msg)
+        if self._failure_count > 0:
+            self._failure_count += 1
+            self.UpdateFailed(self._failure_count, msg)
+
+    @method('com.canonical.SystemImage', out_signature='s')
+    def CancelUpdate(self):
+        self._failure_count = 0
+        return ''
 
 
 class _FailApply(Service):
@@ -219,16 +221,16 @@
     @method('com.canonical.SystemImage')
     def CheckForUpdate(self):
         self.UpdateAvailableStatus(
-            True, False, 42, 1337 * 1024 * 1024,
+            True, False, '42', 1337 * 1024 * 1024,
             '1983-09-13T12:13:14',
-            [
-            {'description': 'Ubuntu Edge support',
-             'description-en_GB': 'change the background colour',
-             'description-fr': "Support d'Ubuntu Edge",
-            },
-            {'description':
-             'Flipped container with 200% boot speed improvement',
-            }],
+            #[
+            #{'description': 'Ubuntu Edge support',
+            # 'description-en_GB': 'change the background colour',
+            # 'description-fr': "Support d'Ubuntu Edge",
+            #},
+            #{'description':
+            # 'Flipped container with 200% boot speed improvement',
+            #}],
             '')
         self.UpdateDownloaded()
 
@@ -246,16 +248,16 @@
     @method('com.canonical.SystemImage')
     def CheckForUpdate(self):
         self.UpdateAvailableStatus(
-            True, False, 42, 1337 * 1024 * 1024,
+            True, False, '42', 1337 * 1024 * 1024,
             '1983-09-13T12:13:14',
-            [
-            {'description': 'Ubuntu Edge support',
-             'description-en_GB': 'change the background colour',
-             'description-fr': "Support d'Ubuntu Edge",
-            },
-            {'description':
-             'Flipped container with 200% boot speed improvement',
-            }],
+            #[
+            #{'description': 'Ubuntu Edge support',
+            # 'description-en_GB': 'change the background colour',
+            # 'description-fr': "Support d'Ubuntu Edge",
+            #},
+            #{'description':
+            # 'Flipped container with 200% boot speed improvement',
+            #}],
             '')
         self.UpdatePaused(42)
 
@@ -272,16 +274,16 @@
     @method('com.canonical.SystemImage')
     def CheckForUpdate(self):
         self.UpdateAvailableStatus(
-            True, True, 42, 1337 * 1024 * 1024,
+            True, True, '42', 1337 * 1024 * 1024,
             '1983-09-13T12:13:14',
-            [
-            {'description': 'Ubuntu Edge support',
-             'description-en_GB': 'change the background colour',
-             'description-fr': "Support d'Ubuntu Edge",
-            },
-            {'description':
-             'Flipped container with 200% boot speed improvement',
-            }],
+            #[
+            #{'description': 'Ubuntu Edge support',
+            # 'description-en_GB': 'change the background colour',
+            # 'description-fr': "Support d'Ubuntu Edge",
+            #},
+            #{'description':
+            # 'Flipped container with 200% boot speed improvement',
+            #}],
             '')
         self.UpdateProgress(10, 0)
 
@@ -289,6 +291,30 @@
     def PauseDownload(self):
         return 'no no, not now'
 
+class _NoUpdate(Service):
+    @method('com.canonical.SystemImage')
+    def CheckForUpdate(self):
+        GLib.timeout_add_seconds(3, self._send_status)
+
+    def _send_status(self):
+        self.UpdateAvailableStatus(
+            False, False, '', 0,
+            '1983-09-13T12:13:14',
+            #[
+            #{'description': 'Ubuntu Edge support',
+            # 'description-en_GB': 'change the background colour',
+            # 'description-fr': "Support d'Ubuntu Edge",
+            #},
+            #{'description':
+            # 'Flipped container with 200% boot speed improvement',
+            #}],
+            '')
+
+
+def get_service(testing_mode, system_bus, object_path, loop):
+    """Return the appropriate service class for the testing mode."""
+    if testing_mode == 'live':
+        ServiceClass = _LiveTestableService
 
 def get_service(testing_mode, system_bus, object_path, loop):
     """Return the appropriate service class for the testing mode."""
@@ -306,6 +332,8 @@
         ServiceClass = _FailResume
     elif testing_mode == 'fail-pause':
         ServiceClass = _FailPause
+    elif testing_mode == 'no-update':
+        ServiceClass = _NoUpdate
     else:
         raise RuntimeError('Invalid testing mode: {}'.format(testing_mode))
     return ServiceClass(system_bus, object_path, loop)