Merge lp:~frankban/rabbitfixture/lp4 into lp:rabbitfixture

[William Grant]

Unmerged revisions

34. By Francesco Banconi on 2012-06-22

Increased retries. Refactored _stop to use retries.

33. By Francesco Banconi on 2012-06-18

Using retries in place of timeout.

32. By Francesco Banconi on 2012-06-07

Bumped version up.

31. By Francesco Banconi on 2012-06-07

Increased timeout in fixtures.

30. By Benji York on 2012-05-22

lp-ify version number

29. By Benji York on 2012-05-22

make the timeouts longer

=== modified file 'rabbitfixture/server.py'
--- rabbitfixture/server.py	2014-05-29 12:26:57 +0000
+++ rabbitfixture/server.py	2014-12-08 02:13:46 +0000
@@ -287,6 +287,23 @@
             os.path.basename(self.config.logfile),
             content_from_file(self.config.logfile))
 
+    def _retry(self, func, check_func=None, tries=300, sleep=0.3):
+        for i in range(tries):
+            if func():
+                return True
+            if check_func is not None and not check_func():
+                return False
+            time.sleep(sleep)
+        return False
+
+    def _accepts_connections(self):
+        """Return True if the node accepts connections, False otherwise."""
+        try:
+            self.environment.get_connection().close()
+        except socket.error:
+            return False
+        return True
+
     def _start(self):
         """Start the RabbitMQ server."""
         # Check if Rabbit is already running. In truth this is really to avoid
@@ -299,12 +316,7 @@
         self._spawn()
         # Wait for the server to come up: stop when the process is dead, or
         # the timeout expires, or the server responds.
-        timeout = time.time() + 15
-        while time.time() < timeout and self.is_running():
-            if self.environment.is_node_running():
-                break
-            time.sleep(0.3)
-        else:
+        if not self._retry(self.environment.is_node_running, self.is_running):
             raise Exception(
                 "Timeout waiting for RabbitMQ server to start: log in %r." %
                 (self.config.logfile,))
@@ -313,16 +325,8 @@
         # fails to get together.
         self.addCleanup(self._stop)
         # `rabbitctl status` can say a node is up before it is ready to accept
-        # connections. Wait at least 5 more seconds for the node to come up...
-        timeout = max(timeout, time.time() + 5)
-        while time.time() < timeout and self.check_running():
-            try:
-                self.environment.get_connection().close()
-            except socket.error:
-                time.sleep(0.1)
-            else:
-                break
-        else:
+        # connections.
+        if not self._retry(self._accepts_connections, self.check_running):
             raise Exception(
                 "Timeout waiting for RabbitMQ node to come up: log in %r." %
                 (self.config.logfile,))
@@ -338,17 +342,10 @@
         """Stop the running server. Normally called by cleanups."""
         self._request_stop()
         # Wait for the node to go down...
-        timeout = time.time() + 15
-        while time.time() < timeout:
-            if not self.environment.is_node_running():
-                break
-            time.sleep(0.3)
-        else:
-            raise Exception(
-                "Timeout waiting for RabbitMQ node to go down.")
-        # Wait at least 5 more seconds for the process to end...
-        timeout = max(timeout, time.time() + 5)
-        while time.time() < timeout:
+        if not self._retry(lambda: not self.environment.is_node_running()):
+            raise Exception("Timeout waiting for RabbitMQ node to go down.")
+        # Wait at while longer for the process to end...
+        for i in range(200):
             if not self.is_running():
                 break
             self.process.terminate()

=== modified file 'setup.py'
--- setup.py	2014-05-29 13:19:05 +0000
+++ setup.py	2014-12-08 02:13:46 +0000
@@ -6,7 +6,11 @@
 
 setup(
     name='rabbitfixture',
+<<<<<<< TREE
     version="0.3.5",
+=======
+    version="0.3.3-lp-4",
+>>>>>>> MERGE-SOURCE
     packages=find_packages('.'),
     package_dir={'': '.'},
     include_package_data=True,