Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc40d939

Browse files
committed
Tests fix and cleanup code
1 parente76232f commitc40d939

File tree

3 files changed

+20
-85
lines changed

3 files changed

+20
-85
lines changed

‎testgres/consts.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
UTILS_LOG_FILE="utils.log"
1414
BACKUP_LOG_FILE="backup.log"
1515

16+
# name of dump/restore formates
17+
DUMP_DIRECTORY="directory"
18+
1619
# default argument values
1720
DEFAULT_XLOG_METHOD="fetch"
1821
DEFAULT_DUMP_FORMAT="plain"

‎testgres/node.py‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
PG_LOG_FILE, \
3030
UTILS_LOG_FILE, \
3131
DEFAULT_XLOG_METHOD, \
32-
DEFAULT_DUMP_FORMAT
32+
DEFAULT_DUMP_FORMAT, \
33+
DUMP_DIRECTORY
3334

3435
from .exceptionsimport \
3536
CatchUpException, \
@@ -705,7 +706,7 @@ def dump(self, filename=None, dbname=None, username=None, format=DEFAULT_DUMP_FO
705706
"""
706707

707708
deftmpfile():
708-
ifformat=='directory':
709+
ifformat==DUMP_DIRECTORY:
709710
fname=tempfile.mkdtemp()
710711
else:
711712
fd,fname=tempfile.mkstemp()
@@ -743,17 +744,6 @@ def restore(self, filename, dbname=None, username=None):
743744
username: database user name.
744745
"""
745746

746-
# self.psql(filename=filename, dbname=dbname, username=username)
747-
# yapf: disable
748-
# _params = [
749-
# get_bin_path("pg_restore"),
750-
# "-p", str(self.port),
751-
# "-h", self.host,
752-
# filename,
753-
# "-U", username,
754-
# "-d", dbname
755-
# ]
756-
757747
# Set default arguments
758748
dbname=dbnameordefault_dbname()
759749
username=usernameordefault_username()
@@ -762,13 +752,10 @@ def restore(self, filename, dbname=None, username=None):
762752
get_bin_path("pg_restore"),
763753
"-p",str(self.port),
764754
"-h",self.host,
765-
# filename,
766-
# "-c",
767-
# "-U", username,
755+
"-U",username,
768756
"-d",dbname,
769757
filename
770758
]
771-
print(_params)
772759

773760
execute_utility(_params,self.utils_log_name)
774761

‎tests/test_simple.py‎

Lines changed: 13 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
importlogging.config
1212
importshutil
1313

14-
importpdb
15-
1614
fromdistutils.versionimportLooseVersion
1715

1816
fromtestgresimport \
@@ -375,96 +373,43 @@ def test_dump(self):
375373
dump=node1.dump()
376374
self.assertTrue(os.path.isfile(dump))
377375
withget_new_node().init().start()asnode2:
378-
# restore dump
379-
node2.restore(filename=dump)
376+
node2.psql(filename=dump,dbname=None,username=None)
380377
res=node2.execute(query_select)
381378
self.assertListEqual(res, [(1, ), (2, )])
382-
# finally, remove dump
383379
os.remove(dump)
384380

385-
deftest_dump_plain(self):
386-
query_create='create table test as select generate_series(1, 2) as val'
387-
query_select='select * from test order by val asc'
388-
389-
withget_new_node().init().start()asnode1:
390-
391-
node1.execute(query_create)
392-
393-
# take a new dump plain format
394381
dump=node1.dump(format='plain')
395382
self.assertTrue(os.path.isfile(dump))
396-
withget_new_node().init().start()asnode2:
397-
# node2.restore(filename=dump)
398-
node2.psql(filename=dump,dbname=None,username=None)#add
399-
res=node2.execute(query_select)
383+
withget_new_node().init().start()asnode3:
384+
node3.psql(filename=dump,dbname=None,username=None)
385+
res=node3.execute(query_select)
400386
self.assertListEqual(res, [(1, ), (2, )])
401387
os.remove(dump)
402388

403-
# with get_new_node().init().start() as node2:
404-
# for f in ['plain', 'custom', 'directory', 'tar']:
405-
# # dump
406-
# dump = node1.dump(format=f)
407-
# # create database
408-
# # connect
409-
# # restore
410-
# node2.restore(filename=f)
411-
# # check
412-
# res = node2.execute(query_select)
413-
# self.assertListEqual(res, [(1, ), (2, )])
414-
# # drop database
415-
# os.remove(f)
416-
417-
deftest_dump_custom(self):
418-
query_create='create table test as select generate_series(1, 2) as val'
419-
query_select='select * from test order by val asc'
420-
421-
withget_new_node().init().start()asnode1:
422-
423-
node1.execute(query_create)
424-
425389
# take a new dump custom format
426390
dump=node1.dump(format='custom')
427391
self.assertTrue(os.path.isfile(dump))
428-
withget_new_node().init().start()asnode2:
429-
node2.restore(filename=dump)
430-
res=node2.execute(query_select)
431-
print(res)
392+
withget_new_node().init().start()asnode4:
393+
node4.restore(filename=dump)
394+
res=node4.execute(query_select)
432395
self.assertListEqual(res, [(1, ), (2, )])
433396
os.remove(dump)
434397

435-
deftest_dump_directory(self):
436-
query_create='create table test as select generate_series(1, 2) as val'
437-
query_select='select * from test order by val asc'
438-
439-
withget_new_node().init().start()asnode1:
440-
441-
node1.execute(query_create)
442-
443398
# take a new dump directory format
444399
dump=node1.dump(format='directory')
445400
self.assertTrue(os.path.isdir(dump))
446-
withget_new_node().init().start()asnode2:
447-
node2.restore(filename=dump)
448-
res=node2.execute(query_select)
401+
withget_new_node().init().start()asnode5:
402+
node5.restore(filename=dump)
403+
res=node5.execute(query_select)
449404
self.assertListEqual(res, [(1, ), (2, )])
450405
shutil.rmtree(dump,ignore_errors=True)
451406

452-
deftest_dump_tar(self):
453-
query_create='create table test as select generate_series(1, 2) as val'
454-
query_select='select * from test order by val asc'
455-
456-
withget_new_node().init().start()asnode1:
457-
458-
node1.execute(query_create)
459-
460407
# take a new dump tar format
461408
dump=node1.dump(format='tar')
462409
self.assertTrue(os.path.isfile(dump))
463-
withget_new_node().init().start()asnode2:
464-
node2.restore(filename=dump)
465-
print("Restore finished")
466-
pdb.set_trace()
467-
res=node2.execute(query_select)
410+
withget_new_node().init().start()asnode6:
411+
node6.restore(filename=dump)
412+
res=node6.execute(query_select)
468413
self.assertListEqual(res, [(1, ), (2, )])
469414
os.remove(dump)
470415

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp