POC UVloop tracing, support for DNS traces

.ci/travis-build-wheels.sh

@@ -9,7 +9,7 @@ if [[ "${TRAVIS_BRANCH}" != "releases" || "${BUILD}" != *wheels* ]]; then
 fi
 
 
-if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
+if [ "${PYENV}" == "true" ]; then
     PYENV_ROOT="$HOME/.pyenv"
     PATH="$PYENV_ROOT/bin:$PATH"
     eval "$(pyenv init -)"

.ci/travis-install.sh

@@ -2,9 +2,17 @@
 
 set -e -x
 
-if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
-    brew update >/dev/null
-    brew upgrade pyenv
+if [ "${PYENV}" == "true" ]; then
+
+    if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
+        brew update >/dev/null
+        brew upgrade pyenv
+    else
+        git clone --depth 1 https://github.com/yyuu/pyenv.git ~/.pyenv
+        PYENV_ROOT="$HOME/.pyenv"
+        PATH="$PYENV_ROOT/bin:$PATH"
+    fi
+
     eval "$(pyenv init -)"
 
     if ! (pyenv versions | grep "${PYTHON_VERSION}$"); then
@@ -13,11 +21,26 @@ if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
     pyenv global ${PYTHON_VERSION}
     pyenv rehash
 
+    python --version
+fi
+
+if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
+    brew update
+
     brew install gnu-sed --with-default-names
     brew outdated libtool || brew upgrade libtool
     brew outdated autoconf || brew upgrade autoconf --with-default-names
     brew outdated automake || brew upgrade automake --with-default-names
+
+    # Pined to 9.0.X till following issues are addressed
+    # https://github.com/pypa/pip/issues/5240
+    # https://github.com/pyenv/pyenv/issues/1141
+    pip install --upgrade pip~=9.0.0
+else
+    pip install --upgrade pip
 fi
 
-pip install --upgrade setuptools pip wheel
+
+pip install --upgrade wheel
+pip install --upgrade setuptools
 pip install -r .ci/requirements.txt

.ci/travis-tests.sh

@@ -7,11 +7,14 @@ if [[ "${BUILD}" != *tests* ]]; then
     exit 0
 fi
 
-if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
+if [ "${PYENV}" == "true" ]; then
     PYENV_ROOT="$HOME/.pyenv"
     PATH="$PYENV_ROOT/bin:$PATH"
     eval "$(pyenv init -)"
+    pyenv global ${PYTHON_VERSION}
 fi
 
+python --version
+
 make distclean && make && make test
 make distclean && make debug && make test

.travis.yml

@@ -28,42 +28,12 @@ matrix:
     fast_finish: true
 
     include:
-        - os: osx
-          osx_image: xcode7.3
-          # Travis macOS env does not support Python yet,
-          # so we have to set things up manually in install.sh.
-          env: BUILD=tests,wheels PYTHON_VERSION=3.5.5
-          branches: {only: [releases]}
-
-        - os: osx
-          osx_image: xcode7.3
-          # Travis macOS env does not support Python yet,
-          # so we have to set things up manually in install.sh.
-          env: BUILD=tests,wheels PYTHON_VERSION=3.6.5
-          branches: {only: [releases]}
-
         - os: linux
-          dist: trusty
+          dist: xenial
           sudo: false
           language: python
-          python: "3.5"
-          env: BUILD=tests
-
-        - os: linux
-          dist: trusty
-          sudo: false
-          language: python
-          python: "3.6"
-          env: BUILD=tests
-
-        - os: linux
-          dist: trusty
-          branches: {only: [releases]}
-          sudo: required
-          language: python
-          python: "3.5"
-          services: [docker]
-          env: BUILD=tests,wheels,release
+          python: "3.7-dev"
+          env: BUILD=tests PYENV=true PYTHON_VERSION=3.7.0b3
 
 cache:
     pip

tests/test_dns.py

@@ -2,6 +2,7 @@
 import unittest
 
 from uvloop import _testbase as tb
+from uvloop import tracing, TracingCollector
 
 
 class BaseTestDNS:
@@ -174,6 +175,34 @@ async def run():
         finally:
             self.loop.close()
 
+    def test_getaddrinfo_tracing(self):
+
+        class DNSCollector(TracingCollector):
+            dns_request_begin_called = False
+            dns_request_end_called = False
+
+            def dns_request_begin(self, *args):
+                self.dns_request_begin_called = True
+
+            def dns_request_end(self, *args):
+                self.dns_request_end_called = True
+
+        collector = DNSCollector()
+        with tracing(collector):
+            self.loop.run_until_complete(
+                self.loop.getaddrinfo('example.com', 80)
+            )
+        assert collector.dns_request_begin_called
+        assert collector.dns_request_end_called
+
+        collector.dns_request_begin_called = False
+        collector.dns_request_end_called = False
+        self.loop.run_until_complete(
+            self.loop.getaddrinfo('example.com', 80)
+        )
+        assert not collector.dns_request_begin_called
+        assert not collector.dns_request_end_called
+
 
 class Test_AIO_DNS(BaseTestDNS, tb.AIOTestCase):
     pass

tests/test_pipes.py

@@ -1,8 +1,8 @@
 import asyncio
 import io
 import os
+import socket
 
-from asyncio import test_utils
 from uvloop import _testbase as tb
 
 
@@ -81,11 +81,11 @@ def connect():
         self.loop.run_until_complete(connect())
 
         os.write(wpipe, b'1')
-        test_utils.run_until(self.loop, lambda: proto.nbytes >= 1)
+        tb.run_until(self.loop, lambda: proto.nbytes >= 1)
         self.assertEqual(1, proto.nbytes)
 
         os.write(wpipe, b'2345')
-        test_utils.run_until(self.loop, lambda: proto.nbytes >= 5)
+        tb.run_until(self.loop, lambda: proto.nbytes >= 5)
         self.assertEqual(['INITIAL', 'CONNECTED'], proto.state)
         self.assertEqual(5, proto.nbytes)
 
@@ -114,11 +114,11 @@ def connect():
         self.loop.run_until_complete(connect())
 
         os.write(slave, b'1')
-        test_utils.run_until(self.loop, lambda: proto.nbytes)
+        tb.run_until(self.loop, lambda: proto.nbytes)
         self.assertEqual(1, proto.nbytes)
 
         os.write(slave, b'2345')
-        test_utils.run_until(self.loop, lambda: proto.nbytes >= 5)
+        tb.run_until(self.loop, lambda: proto.nbytes >= 5)
         self.assertEqual(['INITIAL', 'CONNECTED'], proto.state)
         self.assertEqual(5, proto.nbytes)
 
@@ -157,11 +157,11 @@ def reader(data):
             data += chunk
             return len(data)
 
-        test_utils.run_until(self.loop, lambda: reader(data) >= 1)
+        tb.run_until(self.loop, lambda: reader(data) >= 1)
         self.assertEqual(b'1', data)
 
         transport.write(b'2345')
-        test_utils.run_until(self.loop, lambda: reader(data) >= 5)
+        tb.run_until(self.loop, lambda: reader(data) >= 5)
         self.assertEqual(b'12345', data)
         self.assertEqual('CONNECTED', proto.state)
 
@@ -176,7 +176,7 @@ def reader(data):
         self.assertEqual('CLOSED', proto.state)
 
     def test_write_pipe_disconnect_on_close(self):
-        rsock, wsock = test_utils.socketpair()
+        rsock, wsock = socket.socketpair()
         rsock.setblocking(False)
 
         pipeobj = io.open(wsock.detach(), 'wb', 1024)
@@ -222,12 +222,12 @@ def reader(data):
             data += chunk
             return len(data)
 
-        test_utils.run_until(self.loop, lambda: reader(data) >= 1,
+        tb.run_until(self.loop, lambda: reader(data) >= 1,
                              timeout=10)
         self.assertEqual(b'1', data)
 
         transport.write(b'2345')
-        test_utils.run_until(self.loop, lambda: reader(data) >= 5,
+        tb.run_until(self.loop, lambda: reader(data) >= 5,
                              timeout=10)
         self.assertEqual(b'12345', data)
         self.assertEqual('CONNECTED', proto.state)

tests/test_process.py

@@ -9,7 +9,6 @@
 import time
 import unittest
 
-from asyncio import test_utils
 from uvloop import _testbase as tb
 
 
@@ -504,7 +503,7 @@ def cancel_make_transport():
 
         # ignore the log:
         # "Exception during subprocess creation, kill the subprocess"
-        with test_utils.disable_logger():
+        with tb.disable_logger():
             self.loop.run_until_complete(cancel_make_transport())
 
     def test_cancel_post_init(self):
@@ -522,9 +521,9 @@ def cancel_make_transport():
 
         # ignore the log:
         # "Exception during subprocess creation, kill the subprocess"
-        with test_utils.disable_logger():
+        with tb.disable_logger():
             self.loop.run_until_complete(cancel_make_transport())
-            test_utils.run_briefly(self.loop)
+            tb.run_briefly(self.loop)
 
 
 class Test_UV_Process(_TestProcess, tb.UVTestCase):