Merge lp:~robru/friends/fix-autopkgtest into lp:friends

[Robert Bruce Park]

Fix autopkgtest failures.

[Robert Bruce Park (robru)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Martin Pitt (pitti)]

I confirm that this fixes the autopkgtest, thank you!

=== modified file 'friends/tests/mocks.py'
--- friends/tests/mocks.py	2013-04-17 06:13:49 +0000
+++ friends/tests/mocks.py	2013-07-29 22:12:26 +0000
@@ -333,7 +333,7 @@
         pass
 
     def get_uid(self):
-        return 'test-source-uid'
+        return self.name
 
     def get_extension(self, extension_name):
         return EDSExtension()
@@ -360,5 +360,5 @@
 
     def ref_source(self, src_uid):
         s1 = EDSSource(None, None)
-        s1.set_display_name('test-facebook-contacts')
+        s1.set_display_name('friends-testsuite-contacts')
         return s1
 
=== modified file 'friends/tests/test_facebook.py'
--- friends/tests/test_facebook.py	2013-07-23 08:17:16 +0000
+++ friends/tests/test_facebook.py	2013-07-29 22:12:26 +0000
@@ -590,11 +590,17 @@
 
     @mock.patch('gi.repository.EBook.BookClient.connect_sync',
                 return_value=EDSBookClientMock())
+    @mock.patch('gi.repository.EDataServer.SourceRegistry.new_sync',
+                return_value=EDSRegistry())
     def test_successful_previously_stored_contact(self, *mocks):
         result = self.protocol._previously_stored_contact('11111')
         self.assertEqual(result, True)
 
-    def test_first_run_prepare_eds_connections(self):
+    @mock.patch('gi.repository.EBook.BookClient.connect_sync',
+                return_value=EDSBookClientMock())
+    @mock.patch('gi.repository.EDataServer.SourceRegistry.new_sync',
+                return_value=EDSRegistry())
+    def test_first_run_prepare_eds_connections(self, *mocks):
         self.protocol._name = 'testsuite'
         self.assertIsNone(self.protocol._address_book_name)
         self.assertIsNone(self.protocol._eds_source_registry)