Merge lp:~barry/ubuntu-system-image/lp1365646 into lp:~registry/ubuntu-system-image/client

[Barry Warsaw]

=== modified file 'NEWS.rst'
--- NEWS.rst	2014-09-12 00:47:44 +0000
+++ NEWS.rst	2014-09-12 20:39:45 +0000
@@ -14,6 +14,7 @@
    prefix which can be used to set the log level for the D-Bus API methods.
    By default, they log at `ERROR` level, but can be set lower for debugging
    purposes.  (LP: #1279970)
+ * Don't crash when releasing an unacquired checking lock.  (LP: #1365646)
 
 2.3.2 (2014-07-31)
 ==================

=== modified file 'systemimage/tests/test_dbus.py'
--- systemimage/tests/test_dbus.py	2014-09-11 21:24:47 +0000
+++ systemimage/tests/test_dbus.py	2014-09-12 20:39:45 +0000
@@ -1150,6 +1150,28 @@
         # And now there is a command file for the update.
         self.assertTrue(os.path.exists(self.command_file))
 
+    def test_lp_1365646(self):
+        # After an automatic download is complete, we got three DownloadUpdate
+        # calls with no intervening CheckForUpdate.  This causes a crash since
+        # an unlocked checking lock was released.
+        self.download_always()
+        # Do a normal automatic download.
+        reactor = SignalCapturingReactor('UpdateDownloaded')
+        reactor.run(self.iface.CheckForUpdate)
+        self.assertEqual(len(reactor.signals), 1)
+        # Now, just do a manual DownloadUpdate.  We should get an almost
+        # immediate UpdateDownloaded in response.  Nothing actually gets
+        # downloaded, but the files in the cache are still valid.  The bug
+        # referenced by this method would cause s-i-d to crash, so as long as
+        # the process still exists after the signal is received, the bug is
+        # fixed.  The crash doesn't actually effect any client behavior!  But
+        # the traceback does show up in the crash reporter.
+        process = find_dbus_process(SystemImagePlugin.controller.ini_path)
+        reactor = SignalCapturingReactor('UpdateDownloaded')
+        reactor.run(self.iface.DownloadUpdate)
+        self.assertEqual(len(reactor.signals), 1)
+        self.assertTrue(process.is_running())
+
 
 class TestDBusGetSet(_TestBase):
     """Test the DBus client's key/value settings."""