Merge lp:~robru/friends/lp_1154520 into lp:friends

[Robert Bruce Park]

Safely ignore the release of an unlocked lock. (LP: #1154520)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/friends-ci/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/friends-raring-amd64-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robru/friends/lp_1154520]

167. By Robert Bruce Park on 2013-03-20

Make Flickr tests start with fresh state.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/friends-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-raring-amd64-ci/9

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-ci/9/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

review: Approve

=== modified file 'friends/main.py'
--- friends/main.py	2013-03-20 01:24:15 +0000
+++ friends/main.py	2013-03-21 00:00:32 +0000
@@ -75,6 +75,13 @@
 log = None
 
 
+# We need to acquire the publish lock so that the dispatcher
+# doesn't try to publish rows into an uninitialized model...
+# basically this prevents duplicates from showing up.
+# We release this lock later, once the model is synchronized.
+_publish_lock.acquire()
+
+
 def main():
     global log
     global yappi
@@ -126,10 +133,6 @@
             'private',
             )
 
-    # We need to acquire the publish lock so that the dispatcher
-    # doesn't try to publish rows into an uninitialized model...
-    # basically this prevents duplicates from showing up.
-    _publish_lock.acquire()
     Dispatcher(gsettings, loop)
 
     # Don't initialize caches until the model is synchronized
@@ -165,7 +168,12 @@
     initialize_caches()
 
     # Allow publishing.
-    _publish_lock.release()
+    try:
+        _publish_lock.release()
+    except RuntimeError:
+        # Happens if the lock was already released previously, which
+        # is safe to ignore. Dispatcher goes on to publish normally.
+        pass
 
 
 if __name__ == '__main__':

=== modified file 'friends/tests/test_flickr.py'
--- friends/tests/test_flickr.py	2013-03-14 19:14:03 +0000
+++ friends/tests/test_flickr.py	2013-03-21 00:00:32 +0000
@@ -42,6 +42,7 @@
         self.protocol._get_oauth_headers = lambda *ignore, **kwignore: {}
         self.log_mock = LogMock('friends.utils.base',
                                 'friends.protocols.flickr')
+        TestModel.clear()
 
     def tearDown(self):
         self.log_mock.stop()