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

Commit70aa1da

Browse files
committed
Test_dump refactoring
1 parentd8063d2 commit70aa1da

File tree

1 file changed

+13
-34
lines changed

1 file changed

+13
-34
lines changed

‎tests/test_simple.py‎

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ def removing(f):
6767
finally:
6868
ifos.path.isfile(f):
6969
os.remove(f)
70+
elifos.path.isdir(f):
71+
rmtree(f,ignore_errors=True)
7072

7173

7274
classTestgresTests(unittest.TestCase):
@@ -436,40 +438,17 @@ def test_dump(self):
436438
res=node2.execute(query_select)
437439
self.assertListEqual(res, [(1, ), (2, )])
438440

439-
dump=node1.dump(format='plain')
440-
self.assertTrue(os.path.isfile(dump))
441-
withget_new_node().init().start()asnode3:
442-
node3.restore(filename=dump)
443-
res=node3.execute(query_select)
444-
self.assertListEqual(res, [(1, ), (2, )])
445-
os.remove(dump)
446-
447-
# take a new dump custom format
448-
dump=node1.dump(format='custom')
449-
self.assertTrue(os.path.isfile(dump))
450-
withget_new_node().init().start()asnode4:
451-
node4.restore(filename=dump)
452-
res=node4.execute(query_select)
453-
self.assertListEqual(res, [(1, ), (2, )])
454-
os.remove(dump)
455-
456-
# take a new dump directory format
457-
dump=node1.dump(format='directory')
458-
self.assertTrue(os.path.isdir(dump))
459-
withget_new_node().init().start()asnode5:
460-
node5.restore(filename=dump)
461-
res=node5.execute(query_select)
462-
self.assertListEqual(res, [(1, ), (2, )])
463-
rmtree(dump,ignore_errors=True)
464-
465-
# take a new dump tar format
466-
dump=node1.dump(format='tar')
467-
self.assertTrue(os.path.isfile(dump))
468-
withget_new_node().init().start()asnode6:
469-
node6.restore(filename=dump)
470-
res=node6.execute(query_select)
471-
self.assertListEqual(res, [(1, ), (2, )])
472-
os.remove(dump)
441+
forformatin ['plain','custom','directory','tar']:
442+
withremoving(node1.dump(format=format))asdump:
443+
withget_new_node().init().start()asnode3:
444+
ifformat=='directory':
445+
self.assertTrue(os.path.isdir(dump))
446+
else:
447+
self.assertTrue(os.path.isfile(dump))
448+
# restore dump
449+
node3.restore(filename=dump)
450+
res=node3.execute(query_select)
451+
self.assertListEqual(res, [(1, ), (2, )])
473452

474453
deftest_users(self):
475454
withget_new_node().init().start()asnode:

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp