|
 |
e362057 |
From 738c8eb19a4b064dd74ff851c379dd1cbf11bc65 Mon Sep 17 00:00:00 2001
|
|
|
e362057 |
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
|
|
|
e362057 |
Date: Fri, 5 Feb 2016 21:56:57 +0900
|
|
|
e362057 |
Subject: [PATCH] Use utility methods of testing.common.database >= 1.1.0
|
|
|
e362057 |
|
|
|
e362057 |
---
|
|
|
e362057 |
setup.py | 2 +-
|
|
|
e362057 |
tests/test_postgresql.py | 41 ++++++++++++++--------------------------
|
|
|
e362057 |
2 files changed, 15 insertions(+), 28 deletions(-)
|
|
|
e362057 |
|
|
|
e362057 |
diff --git a/setup.py b/setup.py
|
|
|
e362057 |
index 08095cd..9e95298 100644
|
|
|
e362057 |
--- a/setup.py
|
|
|
e362057 |
+++ b/setup.py
|
|
|
e362057 |
@@ -18,7 +18,7 @@
|
|
|
e362057 |
"Topic :: Software Development :: Testing",
|
|
|
e362057 |
]
|
|
|
e362057 |
|
|
|
e362057 |
-install_requires = ['testing.common.database', 'pg8000 >= 1.10']
|
|
|
e362057 |
+install_requires = ['testing.common.database >= 1.1.0', 'pg8000 >= 1.10']
|
|
|
e362057 |
if sys.version_info < (2, 7):
|
|
|
e362057 |
install_requires.append('unittest2')
|
|
|
e362057 |
|
|
|
e362057 |
diff --git a/tests/test_postgresql.py b/tests/test_postgresql.py
|
|
|
e362057 |
index 29e2b7e..b3603a2 100644
|
|
|
e362057 |
--- a/tests/test_postgresql.py
|
|
|
e362057 |
+++ b/tests/test_postgresql.py
|
|
|
e362057 |
@@ -47,38 +47,31 @@ def test_basic(self):
|
|
|
e362057 |
conn.close()
|
|
|
e362057 |
finally:
|
|
|
e362057 |
# shutting down
|
|
|
e362057 |
- pid = pgsql.pid
|
|
|
e362057 |
- self.assertTrue(pid)
|
|
|
e362057 |
- os.kill(pid, 0) # process is alive
|
|
|
e362057 |
+ pid = pgsql.server_pid
|
|
|
e362057 |
+ self.assertTrue(pgsql.is_alive())
|
|
|
e362057 |
|
|
|
e362057 |
pgsql.stop()
|
|
|
e362057 |
sleep(1)
|
|
|
e362057 |
|
|
|
e362057 |
- self.assertIsNone(pgsql.pid)
|
|
|
e362057 |
+ self.assertFalse(pgsql.is_alive())
|
|
|
e362057 |
with self.assertRaises(OSError):
|
|
|
e362057 |
os.kill(pid, 0) # process is down
|
|
|
e362057 |
|
|
|
e362057 |
def test_stop(self):
|
|
|
e362057 |
# start postgresql server
|
|
|
e362057 |
pgsql = testing.postgresql.Postgresql()
|
|
|
e362057 |
- self.assertIsNotNone(pgsql.pid)
|
|
|
e362057 |
self.assertTrue(os.path.exists(pgsql.base_dir))
|
|
|
e362057 |
- pid = pgsql.pid
|
|
|
e362057 |
- os.kill(pid, 0) # process is alive
|
|
|
e362057 |
+ self.assertTrue(pgsql.is_alive())
|
|
|
e362057 |
|
|
|
e362057 |
# call stop()
|
|
|
e362057 |
pgsql.stop()
|
|
|
e362057 |
- self.assertIsNone(pgsql.pid)
|
|
|
e362057 |
self.assertFalse(os.path.exists(pgsql.base_dir))
|
|
|
e362057 |
- with self.assertRaises(OSError):
|
|
|
e362057 |
- os.kill(pid, 0) # process is down
|
|
|
e362057 |
+ self.assertFalse(pgsql.is_alive())
|
|
|
e362057 |
|
|
|
e362057 |
# call stop() again
|
|
|
e362057 |
pgsql.stop()
|
|
|
e362057 |
- self.assertIsNone(pgsql.pid)
|
|
|
e362057 |
self.assertFalse(os.path.exists(pgsql.base_dir))
|
|
|
e362057 |
- with self.assertRaises(OSError):
|
|
|
e362057 |
- os.kill(pid, 0) # process is down
|
|
|
e362057 |
+ self.assertFalse(pgsql.is_alive())
|
|
|
e362057 |
|
|
|
e362057 |
# delete postgresql object after stop()
|
|
|
e362057 |
del pgsql
|
|
|
e362057 |
@@ -98,20 +91,17 @@ def test_with_statement(self):
|
|
|
e362057 |
self.assertIsNotNone(conn)
|
|
|
e362057 |
conn.close()
|
|
|
e362057 |
|
|
|
e362057 |
- pid = pgsql.pid
|
|
|
e362057 |
- os.kill(pid, 0) # process is alive
|
|
|
e362057 |
+ self.assertTrue(pgsql.is_alive())
|
|
|
e362057 |
|
|
|
e362057 |
- self.assertIsNone(pgsql.pid)
|
|
|
e362057 |
- with self.assertRaises(OSError):
|
|
|
e362057 |
- os.kill(pid, 0) # process is down
|
|
|
e362057 |
+ self.assertFalse(pgsql.is_alive())
|
|
|
e362057 |
|
|
|
e362057 |
def test_multiple_postgresql(self):
|
|
|
e362057 |
pgsql1 = testing.postgresql.Postgresql()
|
|
|
e362057 |
pgsql2 = testing.postgresql.Postgresql()
|
|
|
e362057 |
- self.assertNotEqual(pgsql1.pid, pgsql2.pid)
|
|
|
e362057 |
+ self.assertNotEqual(pgsql1.server_pid, pgsql2.server_pid)
|
|
|
e362057 |
|
|
|
e362057 |
- os.kill(pgsql1.pid, 0) # process is alive
|
|
|
e362057 |
- os.kill(pgsql2.pid, 0) # process is alive
|
|
|
e362057 |
+ self.assertTrue(pgsql1.is_alive())
|
|
|
e362057 |
+ self.assertTrue(pgsql2.is_alive())
|
|
|
e362057 |
|
|
|
e362057 |
def test_postgresql_is_not_found(self):
|
|
|
e362057 |
try:
|
|
|
e362057 |
@@ -135,21 +125,18 @@ def test_fork(self):
|
|
|
e362057 |
else:
|
|
|
e362057 |
os.wait()
|
|
|
e362057 |
sleep(1)
|
|
|
e362057 |
- self.assertTrue(pgsql.pid)
|
|
|
e362057 |
- os.kill(pgsql.pid, 0) # process is alive (delete pgsql obj in child does not effect)
|
|
|
e362057 |
+ self.assertTrue(pgsql.is_alive()) # process is alive (delete pgsql obj in child does not effect)
|
|
|
e362057 |
|
|
|
e362057 |
def test_stop_on_child_process(self):
|
|
|
e362057 |
pgsql = testing.postgresql.Postgresql()
|
|
|
e362057 |
if os.fork() == 0:
|
|
|
e362057 |
pgsql.stop()
|
|
|
e362057 |
- self.assertTrue(pgsql.pid)
|
|
|
e362057 |
- os.kill(pgsql.pid, 0) # process is alive (calling stop() is ignored)
|
|
|
e362057 |
+ os.kill(pgsql.server_pid, 0) # process is alive (calling stop() is ignored)
|
|
|
e362057 |
os.kill(os.getpid(), signal.SIGTERM) # exit tests FORCELY
|
|
|
e362057 |
else:
|
|
|
e362057 |
os.wait()
|
|
|
e362057 |
sleep(1)
|
|
|
e362057 |
- self.assertTrue(pgsql.pid)
|
|
|
e362057 |
- os.kill(pgsql.pid, 0) # process is alive (calling stop() in child is ignored)
|
|
|
e362057 |
+ self.assertTrue(pgsql.is_alive()) # process is alive (calling stop() in child is ignored)
|
|
|
e362057 |
|
|
|
e362057 |
def test_copy_data_from(self):
|
|
|
e362057 |
try:
|