Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e2e7e8b

Browse files
dmitry-lipetskdmitry-lipetsk
committed
Using pytest [assertTrue]
1 parent 1cb664e commit e2e7e8b

File tree

2 files changed

+68
-68
lines changed

2 files changed

+68
-68
lines changed

‎tests/test_simple.py

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ def test_init_unique_system_id(self):
160160

161161
with scoped_config(cache_initdb=True,
162162
cached_initdb_unique=True) as config:
163-
self.assertTrue(config.cache_initdb)
164-
self.assertTrue(config.cached_initdb_unique)
163+
assert (config.cache_initdb)
164+
assert (config.cached_initdb_unique)
165165

166166
# spawn two nodes; ids must be different
167167
with get_new_node().init().start() as node1, \
@@ -183,7 +183,7 @@ def test_node_exit(self):
183183
node.safe_psql('select 1')
184184

185185
# we should save the DB for "debugging"
186-
self.assertTrue(os.path.exists(base_dir))
186+
assert (os.path.exists(base_dir))
187187
rmtree(base_dir, ignore_errors=True)
188188

189189
with get_new_node().init() as node:
@@ -196,7 +196,7 @@ def test_double_start(self):
196196
with get_new_node().init().start() as node:
197197
# can't start node more than once
198198
node.start()
199-
self.assertTrue(node.is_started)
199+
assert (node.is_started)
200200

201201
def test_uninitialized_start(self):
202202
with get_new_node() as node:
@@ -241,10 +241,10 @@ def test_pg_ctl(self):
241241
node.init().start()
242242

243243
status = node.pg_ctl(['status'])
244-
self.assertTrue('PID' in status)
244+
assert ('PID' in status)
245245

246246
def test_status(self):
247-
self.assertTrue(NodeStatus.Running)
247+
assert (NodeStatus.Running)
248248
assert not (NodeStatus.Stopped)
249249
assert not (NodeStatus.Uninitialized)
250250

@@ -320,7 +320,7 @@ def test_psql(self):
320320
def test_safe_psql__expect_error(self):
321321
with get_new_node().init().start() as node:
322322
err = node.safe_psql('select_or_not_select 1', expect_error=True)
323-
self.assertTrue(type(err) == str) # noqa: E721
323+
assert (type(err) == str) # noqa: E721
324324
self.assertIn('select_or_not_select', err)
325325
self.assertIn('ERROR: syntax error at or near "select_or_not_select"', err)
326326

@@ -371,7 +371,7 @@ def test_control_data(self):
371371

372372
# check returned dict
373373
assert data is not None
374-
self.assertTrue(any('pg_control' in s for s in data.keys()))
374+
assert (any('pg_control' in s for s in data.keys()))
375375

376376
def test_backup_simple(self):
377377
with get_new_node() as master:
@@ -651,9 +651,9 @@ def test_dump(self):
651651
with removing(node1.dump(format=format)) as dump:
652652
with get_new_node().init().start() as node3:
653653
if format == 'directory':
654-
self.assertTrue(os.path.isdir(dump))
654+
assert (os.path.isdir(dump))
655655
else:
656-
self.assertTrue(os.path.isfile(dump))
656+
assert (os.path.isfile(dump))
657657
# restore dump
658658
node3.restore(filename=dump)
659659
res = node3.execute(query_select)
@@ -677,7 +677,7 @@ def test_poll_query_until(self):
677677
node.poll_query_until(query=check_time.format(start_time))
678678
end_time = node.execute(get_time)[0][0]
679679

680-
self.assertTrue(end_time - start_time >= 5)
680+
assert (end_time - start_time >= 5)
681681

682682
# check 0 columns
683683
with pytest.raises(expected_exception=QueryException):
@@ -770,13 +770,13 @@ def test_logging(self):
770770
# check that master's port is found
771771
with open(logfile.name, 'r') as log:
772772
lines = log.readlines()
773-
self.assertTrue(any(node_name in s for s in lines))
773+
assert (any(node_name in s for s in lines))
774774

775775
# test logger after stop/start/restart
776776
master.stop()
777777
master.start()
778778
master.restart()
779-
self.assertTrue(master._logger.is_alive())
779+
assert (master._logger.is_alive())
780780

781781
# @unittest.skipUnless(util_exists('pgbench.exe' if os.name == 'nt' else 'pgbench'), 'pgbench might be missing')
782782
def test_pgbench(self):
@@ -798,7 +798,7 @@ def test_pgbench(self):
798798

799799
proc.stdout.close()
800800

801-
self.assertTrue('tps' in out)
801+
assert ('tps' in out)
802802

803803
def test_pg_config(self):
804804
# check same instances
@@ -872,13 +872,13 @@ def test_auto_name(self):
872872
with get_new_node().init(allow_streaming=True).start() as m:
873873
with m.replicate().start() as r:
874874
# check that nodes are running
875-
self.assertTrue(m.status())
876-
self.assertTrue(r.status())
875+
assert (m.status())
876+
assert (r.status())
877877

878878
# check their names
879879
self.assertNotEqual(m.name, r.name)
880-
self.assertTrue('testgres' in m.name)
881-
self.assertTrue('testgres' in r.name)
880+
assert ('testgres' in m.name)
881+
assert ('testgres' in r.name)
882882

883883
def test_file_tail(self):
884884
from testgres.utils import file_tail
@@ -957,21 +957,21 @@ def test_version_management(self):
957957
g = PgVer('15.3.1bihabeta1')
958958
k = PgVer('15.3.1')
959959

960-
self.assertTrue(a == b)
961-
self.assertTrue(b > c)
962-
self.assertTrue(a > c)
963-
self.assertTrue(d > e)
964-
self.assertTrue(e > f)
965-
self.assertTrue(d > f)
966-
self.assertTrue(h > f)
967-
self.assertTrue(h == i)
968-
self.assertTrue(g == k)
969-
self.assertTrue(g > h)
960+
assert (a == b)
961+
assert (b > c)
962+
assert (a > c)
963+
assert (d > e)
964+
assert (e > f)
965+
assert (d > f)
966+
assert (h > f)
967+
assert (h == i)
968+
assert (g == k)
969+
assert (g > h)
970970

971971
version = get_pg_version()
972972
with get_new_node() as node:
973-
self.assertTrue(isinstance(version, six.string_types))
974-
self.assertTrue(isinstance(node.version, PgVer))
973+
assert (isinstance(version, six.string_types))
974+
assert (isinstance(node.version, PgVer))
975975
self.assertEqual(node.version, PgVer(version))
976976

977977
def test_child_pids(self):
@@ -1054,7 +1054,7 @@ def test_upgrade_node(self):
10541054
node_new.init(cached=False)
10551055
res = node_new.upgrade_from(old_node=node_old)
10561056
node_new.start()
1057-
self.assertTrue(b'Upgrade Complete' in res)
1057+
assert (b'Upgrade Complete' in res)
10581058

10591059
def test_parse_pg_version(self):
10601060
# Linux Mint
@@ -1069,7 +1069,7 @@ def test_parse_pg_version(self):
10691069
def test_the_same_port(self):
10701070
with get_new_node() as node:
10711071
node.init().start()
1072-
self.assertTrue(node._should_free_port)
1072+
assert (node._should_free_port)
10731073
self.assertEqual(type(node.port), int)
10741074
node_port_copy = node.port
10751075
self.assertEqual(rm_carriage_returns(node.safe_psql("SELECT 1;")), b'1\n')
@@ -1087,7 +1087,7 @@ def test_the_same_port(self):
10871087

10881088
# node is still working
10891089
self.assertEqual(node.port, node_port_copy)
1090-
self.assertTrue(node._should_free_port)
1090+
assert (node._should_free_port)
10911091
self.assertEqual(rm_carriage_returns(node.safe_psql("SELECT 3;")), b'3\n')
10921092

10931093
class tagPortManagerProxy:
@@ -1193,30 +1193,30 @@ def test_port_rereserve_during_node_start(self):
11931193

11941194
with get_new_node() as node1:
11951195
node1.init().start()
1196-
self.assertTrue(node1._should_free_port)
1196+
assert (node1._should_free_port)
11971197
self.assertEqual(type(node1.port), int) # noqa: E721
11981198
node1_port_copy = node1.port
11991199
self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 1;")), b'1\n')
12001200

12011201
with __class__.tagPortManagerProxy(node1.port, C_COUNT_OF_BAD_PORT_USAGE):
12021202
assert __class__.tagPortManagerProxy.sm_DummyPortNumber == node1.port
12031203
with get_new_node() as node2:
1204-
self.assertTrue(node2._should_free_port)
1204+
assert (node2._should_free_port)
12051205
self.assertEqual(node2.port, node1.port)
12061206

12071207
node2.init().start()
12081208

12091209
self.assertNotEqual(node2.port, node1.port)
1210-
self.assertTrue(node2._should_free_port)
1210+
assert (node2._should_free_port)
12111211
self.assertEqual(__class__.tagPortManagerProxy.sm_DummyPortCurrentUsage, 0)
12121212
self.assertEqual(__class__.tagPortManagerProxy.sm_DummyPortTotalUsage, C_COUNT_OF_BAD_PORT_USAGE)
1213-
self.assertTrue(node2.is_started)
1213+
assert (node2.is_started)
12141214

12151215
self.assertEqual(rm_carriage_returns(node2.safe_psql("SELECT 2;")), b'2\n')
12161216

12171217
# node1 is still working
12181218
self.assertEqual(node1.port, node1_port_copy)
1219-
self.assertTrue(node1._should_free_port)
1219+
assert (node1._should_free_port)
12201220
self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 3;")), b'3\n')
12211221

12221222
def test_port_conflict(self):
@@ -1226,15 +1226,15 @@ def test_port_conflict(self):
12261226

12271227
with get_new_node() as node1:
12281228
node1.init().start()
1229-
self.assertTrue(node1._should_free_port)
1229+
assert (node1._should_free_port)
12301230
self.assertEqual(type(node1.port), int) # noqa: E721
12311231
node1_port_copy = node1.port
12321232
self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 1;")), b'1\n')
12331233

12341234
with __class__.tagPortManagerProxy(node1.port, C_COUNT_OF_BAD_PORT_USAGE):
12351235
assert __class__.tagPortManagerProxy.sm_DummyPortNumber == node1.port
12361236
with get_new_node() as node2:
1237-
self.assertTrue(node2._should_free_port)
1237+
assert (node2._should_free_port)
12381238
self.assertEqual(node2.port, node1.port)
12391239

12401240
with pytest.raises(
@@ -1244,7 +1244,7 @@ def test_port_conflict(self):
12441244
node2.init().start()
12451245

12461246
self.assertEqual(node2.port, node1.port)
1247-
self.assertTrue(node2._should_free_port)
1247+
assert (node2._should_free_port)
12481248
self.assertEqual(__class__.tagPortManagerProxy.sm_DummyPortCurrentUsage, 1)
12491249
self.assertEqual(__class__.tagPortManagerProxy.sm_DummyPortTotalUsage, C_COUNT_OF_BAD_PORT_USAGE)
12501250
assert not (node2.is_started)
@@ -1254,7 +1254,7 @@ def test_port_conflict(self):
12541254

12551255
# node1 is still working
12561256
self.assertEqual(node1.port, node1_port_copy)
1257-
self.assertTrue(node1._should_free_port)
1257+
assert (node1._should_free_port)
12581258
self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 3;")), b'3\n')
12591259

12601260
def test_simple_with_bin_dir(self):

0 commit comments

Comments
 (0)