Fixes

Author: elprans

asyncpg/_testbase/__init__.py

@@ -79,12 +79,14 @@ def wrapper(self, *args, __meth__=meth, **kwargs):
                 timeout = getattr(__meth__, '__timeout__', mcls.TEST_TIMEOUT)
                 if timeout:
                     coro = asyncio.wait_for(coro, timeout, loop=self.loop)
-                try:
+                    try:
+                        self.loop.run_until_complete(coro)
+                    except asyncio.TimeoutError:
+                        raise self.failureException(
+                            'test timed out after {} seconds'.format(
+                                timeout)) from None
+                else:
                     self.loop.run_until_complete(coro)
-                except asyncio.TimeoutError:
-                    raise self.failureException(
-                        'test timed out after {} seconds'.format(
-                            timeout)) from None
             ns[methname] = wrapper
 
         return super().__new__(mcls, name, bases, ns)

asyncpg/cluster.py

@@ -202,16 +202,24 @@ def start(self, wait=60, *, server_settings={}, **opts):
             # of postgres daemon under an Administrative account
             # is not permitted and there is no easy way to drop
             # privileges.
+            if os.getenv('ASYNCPG_DEBUG_SERVER'):
+                stdout = sys.stdout
+            else:
+                stdout = subprocess.DEVNULL
+
             process = subprocess.run(
                 [self._pg_ctl, 'start', '-D', self._data_dir,
                  '-o', ' '.join(extra_args)],
-                stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-            stderr = process.stderr
+                stdout=stdout, stderr=subprocess.STDOUT)
 
             if process.returncode != 0:
+                if process.stderr:
+                    stderr = ':\n{}'.format(process.stderr.decode())
+                else:
+                    stderr = ''
                 raise ClusterError(
-                    'pg_ctl start exited with status {:d}: {}'.format(
-                        process.returncode, stderr.decode()))
+                    'pg_ctl start exited with status {:d}{}'.format(
+                        process.returncode, stderr))
         else:
             if os.getenv('ASYNCPG_DEBUG_SERVER'):
                 stdout = sys.stdout
@@ -448,6 +456,7 @@ def _test_connection(self, timeout=60):
                 try:
                     con = loop.run_until_complete(
                         asyncpg.connect(database='postgres',
+                                        user='postgres',
                                         timeout=5, loop=loop,
                                         **self._connection_addr))
                 except (OSError, asyncio.TimeoutError,

asyncpg/pool.py

@@ -201,7 +201,8 @@ async def release(self, timeout):
                     await asyncio.wait_for(
                         self._con._protocol._wait_for_cancellation(),
                         timeout, loop=self._pool._loop)
-                    budget -= time.monotonic() - started
+                    if budget is not None:
+                        budget -= time.monotonic() - started
 
                 await self._con.reset(timeout=budget)
             except Exception as ex: