Merge pull request #479 from mattbennett/trusty-fix

Trusty fix

.travis.yml

@@ -2,13 +2,18 @@ sudo: false
 language: python
 
 services:
-    - rabbitmq
+  - docker
 
 before_install:
+    # start rabbitmq
+    - docker run -d --hostname rabbitmq --name rabbitmq -p 15672:15672 -p 5672:5672 -e RABBITMQ_DEFAULT_USER=guest -e RABBITMQ_DEFAULT_PASS=guest rabbitmq:3.6.6-management
+    # install toxiproxy
     - mkdir $PWD/bin
     - wget -O $PWD/bin/toxiproxy-server https://github.com/Shopify/toxiproxy/releases/download/v2.0.0/toxiproxy-server-linux-amd64
     - chmod +x $PWD/bin/toxiproxy-server
     - export PATH=$PATH:$PWD/bin/
+    # work around https://github.com/travis-ci/travis-ci/issues/7940
+    - sudo rm -f /etc/boto.cfg
 
 addons:
   apt_packages:

nameko/testing/pytest.py

@@ -322,7 +322,7 @@ def web_config(empty_config):
     port = find_free_port()
 
     cfg = empty_config
-    cfg[WEB_SERVER_CONFIG_KEY] = str(port)
+    cfg[WEB_SERVER_CONFIG_KEY] = "127.0.0.1:{}".format(port)
     return cfg
 
 

test/test_queue_consumer.py

@@ -22,6 +22,7 @@
 from nameko.testing.utils import (
     assert_stops_raising, get_extension, get_rabbit_connections
 )
+from nameko.utils.retry import retry
 
 
 TIMEOUT = 5
@@ -344,10 +345,15 @@ def handle_message(self, body, message):
 
     # no connections should remain for our vhost
     vhost = rabbit_config['vhost']
-    connections = get_rabbit_connections(vhost, rabbit_manager)
-    if connections:  # pragma: no cover
-        for connection in connections:
-            assert connection['vhost'] != vhost
+
+    @retry
+    def check_connections_closed():
+        connections = get_rabbit_connections(vhost, rabbit_manager)
+        if connections:  # pragma: no cover
+            for connection in connections:
+                assert connection['vhost'] != vhost
+
+    check_connections_closed()
 
 
 class TestHeartbeats(object):

tox.ini

@@ -25,6 +25,11 @@ deps =
     pinned: werkzeug==0.11.11
     pinned: wrapt==1.10.8
 
+    # we can't test eventlet>0.20.1 in our py27 CI environment until the fix
+    # in https://github.com/eventlet/eventlet/issues/401 is released
+    py27-latest: eventlet==0.20.1
+    py27-examples: eventlet==0.20.1
+
 setenv =
     branchcoverage: ENABLE_BRANCH_COVERAGE=1
     examples: ENABLE_BRANCH_COVERAGE=1