Tests fix and cleanup code

Author: Fenimorkin

testgres/consts.py

@@ -13,6 +13,9 @@
 UTILS_LOG_FILE = "utils.log"
 BACKUP_LOG_FILE = "backup.log"
 
+# name of dump/restore formates
+DUMP_DIRECTORY = "directory"
+
 # default argument values
 DEFAULT_XLOG_METHOD = "fetch"
 DEFAULT_DUMP_FORMAT = "plain"

testgres/node.py

@@ -29,7 +29,8 @@
     PG_LOG_FILE, \
     UTILS_LOG_FILE, \
     DEFAULT_XLOG_METHOD, \
-    DEFAULT_DUMP_FORMAT
+    DEFAULT_DUMP_FORMAT, \
+    DUMP_DIRECTORY
 
 from .exceptions import \
     CatchUpException,   \
@@ -705,7 +706,7 @@ def dump(self, filename=None, dbname=None, username=None, format=DEFAULT_DUMP_FO
         """
 
         def tmpfile():
-            if format == 'directory':
+            if format == DUMP_DIRECTORY:
                 fname = tempfile.mkdtemp()
             else:
                 fd, fname = tempfile.mkstemp()
@@ -743,17 +744,6 @@ def restore(self, filename, dbname=None, username=None):
             username: database user name.
         """
 
-        # self.psql(filename=filename, dbname=dbname, username=username)
-                # yapf: disable
-        # _params = [
-        #     get_bin_path("pg_restore"),
-        #     "-p", str(self.port),
-        #     "-h", self.host,
-        #           filename,
-        #     "-U", username,
-        #     "-d", dbname
-        # ]
-
         # Set default arguments
         dbname = dbname or default_dbname()
         username = username or default_username()
@@ -762,13 +752,10 @@ def restore(self, filename, dbname=None, username=None):
             get_bin_path("pg_restore"),
             "-p", str(self.port),
             "-h", self.host,
-            #       filename,
-            # "-c",
-            # "-U", username,
+            "-U", username,
             "-d", dbname,
             filename
         ]
-        print(_params)
 
         execute_utility(_params, self.utils_log_name)
 

tests/test_simple.py

@@ -11,8 +11,6 @@
 import logging.config
 import shutil
 
-import pdb
-
 from distutils.version import LooseVersion
 
 from testgres import \
@@ -375,96 +373,43 @@ def test_dump(self):
             dump = node1.dump()
             self.assertTrue(os.path.isfile(dump))
             with get_new_node().init().start() as node2:
-                # restore dump
-                node2.restore(filename=dump)
+                node2.psql(filename=dump, dbname=None, username=None)
                 res = node2.execute(query_select)
                 self.assertListEqual(res, [(1, ), (2, )])
-            # finally, remove dump
             os.remove(dump)
 
-    def test_dump_plain(self):
-        query_create = 'create table test as select generate_series(1, 2) as val'
-        query_select = 'select * from test order by val asc'
-
-        with get_new_node().init().start() as node1:
-
-            node1.execute(query_create)
-
-            # take a new dump plain format
             dump = node1.dump(format='plain')
             self.assertTrue(os.path.isfile(dump))
-            with get_new_node().init().start() as node2:
-                # node2.restore(filename=dump)
-                node2.psql(filename=dump, dbname=None, username=None) #add
-                res = node2.execute(query_select)
+            with get_new_node().init().start() as node3:
+                node3.psql(filename=dump, dbname=None, username=None)
+                res = node3.execute(query_select)
                 self.assertListEqual(res, [(1, ), (2, )])
             os.remove(dump)
 
-            # with get_new_node().init().start() as node2:
-            #     for f in ['plain', 'custom', 'directory', 'tar']:
-            #         # dump
-            #         dump = node1.dump(format=f)
-            #         # create database
-            #         # connect
-            #         # restore
-            #         node2.restore(filename=f)
-            #         # check
-            #         res = node2.execute(query_select)
-            #         self.assertListEqual(res, [(1, ), (2, )])
-            #         # drop database
-            #         os.remove(f)
-
-    def test_dump_custom(self):
-        query_create = 'create table test as select generate_series(1, 2) as val'
-        query_select = 'select * from test order by val asc'
-
-        with get_new_node().init().start() as node1:
-
-            node1.execute(query_create)
-
             # take a new dump custom format
             dump = node1.dump(format='custom')
             self.assertTrue(os.path.isfile(dump))
-            with get_new_node().init().start() as node2:
-                node2.restore(filename=dump)
-                res = node2.execute(query_select)
-                print(res)
+            with get_new_node().init().start() as node4:
+                node4.restore(filename=dump)
+                res = node4.execute(query_select)
                 self.assertListEqual(res, [(1, ), (2, )])
             os.remove(dump)
 
-    def test_dump_directory(self):
-        query_create = 'create table test as select generate_series(1, 2) as val'
-        query_select = 'select * from test order by val asc'
-
-        with get_new_node().init().start() as node1:
-
-            node1.execute(query_create)
-
             # take a new dump directory format
             dump = node1.dump(format='directory')
             self.assertTrue(os.path.isdir(dump))
-            with get_new_node().init().start() as node2:
-                node2.restore(filename=dump)
-                res = node2.execute(query_select)
+            with get_new_node().init().start() as node5:
+                node5.restore(filename=dump)
+                res = node5.execute(query_select)
                 self.assertListEqual(res, [(1, ), (2, )])
             shutil.rmtree(dump, ignore_errors=True)
 
-    def test_dump_tar(self):
-        query_create = 'create table test as select generate_series(1, 2) as val'
-        query_select = 'select * from test order by val asc'
-
-        with get_new_node().init().start() as node1:
-
-            node1.execute(query_create)
-
             # take a new dump tar format
             dump = node1.dump(format='tar')
             self.assertTrue(os.path.isfile(dump))
-            with get_new_node().init().start() as node2:
-                node2.restore(filename=dump)
-                print("Restore finished")
-                pdb.set_trace()
-                res = node2.execute(query_select)
+            with get_new_node().init().start() as node6:
+                node6.restore(filename=dump)
+                res = node6.execute(query_select)
                 self.assertListEqual(res, [(1, ), (2, )])
             os.remove(dump)