Merge lp:~allenap/maas/unreliable-test--bug-1308069--1.5 into lp:maas/1.5

[Gavin Panella]

Backport lp:maas r2271: Reenable test_prepare_holds_startup_lock.

Reproducing the spurious failure was not possible. Reintroducing it to the test suite will again expose it to a more varied environment, with the hope that we learn how to reproduce it should it happen again.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
--- src/maasserver/rpc/tests/test_regionservice.py	2014-04-15 15:40:07 +0000
+++ src/maasserver/rpc/tests/test_regionservice.py	2014-04-15 21:09:55 +0000
@@ -82,7 +82,6 @@
 from twisted.internet.threads import deferToThread
 from twisted.protocols import amp
 from twisted.python import log
-from unittest import skip
 
 
 class TestRegionProtocol_Identify(MAASTestCase):
@@ -642,7 +641,6 @@
                 cursor.execute("SELECT * FROM eventloops")
                 self.assertEqual([], list(cursor))
 
-    @skip("XXX gmb 2014-04-15 bug=1308069: Fails spuriously.")
     def test_prepare_holds_startup_lock(self):
         # Creating tables in PostgreSQL is a transactional operation
         # like any other. If the isolation level is not sufficient - the