psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-08-01 19:00:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix test on windows

Browse Source
This commit is contained in:
Richard Bann 2019-06-18 22:26:00 +02:00
parent 52fc8bbeda
commit ff64a8b409
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tests/test_connection.py
View File

@ -35,8 +35,8 @@ import subprocess as sp
from collections import deque from collections import deque
from operator import attrgetter from operator import attrgetter
from weakref import ref from weakref import ref
import multiprocessing
import signal import signal
import platform
import psycopg2 import psycopg2
import psycopg2.extras import psycopg2.extras
@ -45,7 +45,7 @@ from psycopg2 import extensions as ext
from .testutils import ( from .testutils import (
PY2, unittest, skip_if_no_superuser, skip_before_postgres, PY2, unittest, skip_if_no_superuser, skip_before_postgres,
skip_after_postgres, skip_before_libpq, skip_after_libpq, skip_after_postgres, skip_before_libpq, skip_after_libpq,
ConnectingTestCase, skip_if_tpc_disabled, skip_if_windows, slow, green) ConnectingTestCase, skip_if_tpc_disabled, skip_if_windows, slow)
from .testconfig import dbhost, dsn, dbname from .testconfig import dbhost, dsn, dbname
@ -412,28 +412,31 @@ t.join()
@slow @slow
def test_handles_keyboardinterrupt(self): def test_handles_keyboardinterrupt(self):
def conn(queue): script = """\
host = "10.255.255.1" # will timeout import psycopg2
queue.put(1) host = "10.255.255.1" # will timeout
try: try:
self.connect(host=host, password="x", connect_timeout=1) psycopg2.connect(host=host, password="x", connect_timeout=1)
except KeyboardInterrupt: except KeyboardInterrupt:
queue.put("KeyboardInterrupt") print("KeyboardInterrupt")
except Exception as e: except Exception as e:
queue.put(str(e)) print(str(e))
"""
queue = multiprocessing.Queue() if platform.system() == 'Windows':
process = multiprocessing.Process(target=conn, args=(queue,)) proc = sp.Popen([sys.executable, '-c', script], stdout=sp.PIPE,
process.start() universal_newlines=True,
queue.get() creationflags=sp.CREATE_NEW_PROCESS_GROUP)
time.sleep(0.5) time.sleep(0.5)
os.kill(process.pid, signal.SIGINT) proc.send_signal(signal.CTRL_C_EVENT)
raised = queue.get()
process.join()
if green:
self.assertEqual(raised, "asynchronous connection attempt underway")
else: else:
self.assertEqual(raised, "KeyboardInterrupt") proc = sp.Popen([sys.executable, '-c', script], stdout=sp.PIPE,
universal_newlines=True)
time.sleep(0.5)
proc.send_signal(signal.SIGINT)
proc.wait()
out = proc.stdout.read().strip()
proc.stdout.close()
self.assertEqual(out, "KeyboardInterrupt")
class ParseDsnTestCase(ConnectingTestCase): class ParseDsnTestCase(ConnectingTestCase):