Use 'localhost' instead of '127.0.0.1' to prevent errors when testing with Python 3.4

Author: lgrahl

.travis.yml

@@ -17,30 +17,40 @@ matrix:
   include:
   - python: "3.4"
     env:
-      - EVENT_LOOP=asyncio
-      - TIMEOUT=2.0
+    - EVENT_LOOP=asyncio
+    - TIMEOUT=8.0
   - python: "3.5"
     env:
-      - EVENT_LOOP=asyncio
-      - TIMEOUT=2.0
+    - EVENT_LOOP=asyncio
+    - TIMEOUT=2.0
   - python: "3.5"
     env:
-      - EVENT_LOOP=uvloop
-      - TIMEOUT=2.0
+    - EVENT_LOOP=uvloop
+    - TIMEOUT=2.0
     before_script: "pip install .[uvloop]"
   - python: "3.6"
     env:
-      - EVENT_LOOP=asyncio
-      - TIMEOUT=2.0
+    - EVENT_LOOP=asyncio
+    - TIMEOUT=2.0
   - python: "3.6"
     env:
-      - EVENT_LOOP=uvloop
-      - TIMEOUT=2.0
+    - EVENT_LOOP=uvloop
+    - TIMEOUT=2.0
     before_script: "pip install .[uvloop]"
+# TODO: Enable once 3.7 support has been added
+#  - python: "3.7"
+#    env:
+#    - EVENT_LOOP=asyncio
+#    - TIMEOUT=2.0
+#  - python: "3.7"
+#    env:
+#    - EVENT_LOOP=uvloop
+#    - TIMEOUT=2.0
+#    before_script: "pip install .[uvloop]"
   - python: "pypy3"  # 2017-08-05: It's pypy3-5.8.0-beta
     env:
-      - EVENT_LOOP=asyncio
-      - TIMEOUT=16.0
+    - EVENT_LOOP=asyncio
+    - TIMEOUT=16.0
 # TODO: Re-enable once pypy3 is able to compile uvloop
 #  - python: "pypy3"  # 2017-08-05: It's pypy3-5.8.0-beta
 #    env:

tests/conftest.py

@@ -61,7 +61,7 @@ def pytest_namespace():
         'have_uvloop': pytest.mark.skipif(not have_uvloop, reason='requires uvloop'),
         'no_uvloop': pytest.mark.skipif(
             have_uvloop, reason='requires uvloop to be not installed'),
-        'ip': '127.0.0.1',
+        'host': 'localhost',
         'port': 8766,
         'cli_path': os.path.join(sys.exec_prefix, 'bin', 'saltyrtc-server'),
         'key': os.path.normpath(
@@ -103,7 +103,7 @@ def unused_tcp_port():
     Find an unused localhost TCP port from 1024-65535 and return it.
     """
     with closing(socket.socket()) as sock:
-        sock.bind((pytest.saltyrtc.ip, 0))
+        sock.bind((pytest.saltyrtc.host, 0))
         return sock.getsockname()[1]
 
 
@@ -319,15 +319,15 @@ def _server_factory(permanent_keys=None):
                 pytest.saltyrtc.cert, keyfile=pytest.saltyrtc.key,
                 dh_params_file=pytest.saltyrtc.dh_params),
             permanent_keys,
-            host=pytest.saltyrtc.ip,
+            host=pytest.saltyrtc.host,
             port=port,
             loop=event_loop,
             server_class=TestServer,
         )
         server_ = event_loop.run_until_complete(coroutine)
         # Inject timeout and address (little bit of a hack but meh...)
         server_.timeout = _get_timeout(request=request)
-        server_.address = (pytest.saltyrtc.ip, port)
+        server_.address = (pytest.saltyrtc.host, port)
 
         _server_instances.append(server_)