tests fixes, del_test_dir added

Author: gsmolk

tests/__init__.py

@@ -6,16 +6,11 @@
     ptrack_move_to_tablespace, ptrack_recovery, ptrack_vacuum, \
     ptrack_vacuum_bits_frozen, ptrack_vacuum_bits_visibility, \
     ptrack_vacuum_full, ptrack_vacuum_truncate, pgpro560, pgpro589, \
-    pgpro688, false_positive, replica
+    false_positive, replica
 
 
 def load_tests(loader, tests, pattern):
     suite = unittest.TestSuite()
-    suite.addTests(loader.loadTestsFromModule(replica))
-#    suite.addTests(loader.loadTestsFromModule(pgpro560))
-#    suite.addTests(loader.loadTestsFromModule(pgpro589))
-#    suite.addTests(loader.loadTestsFromModule(pgpro688))
-#    suite.addTests(loader.loadTestsFromModule(false_positive))
     suite.addTests(loader.loadTestsFromModule(init_test))
     suite.addTests(loader.loadTestsFromModule(option_test))
     suite.addTests(loader.loadTestsFromModule(show_test))
@@ -33,8 +28,9 @@ def load_tests(loader, tests, pattern):
     suite.addTests(loader.loadTestsFromModule(ptrack_vacuum_bits_visibility))
     suite.addTests(loader.loadTestsFromModule(ptrack_vacuum_full))
     suite.addTests(loader.loadTestsFromModule(ptrack_vacuum_truncate))
+    suite.addTests(loader.loadTestsFromModule(replica))
+    suite.addTests(loader.loadTestsFromModule(pgpro560))
+    suite.addTests(loader.loadTestsFromModule(pgpro589))
+    suite.addTests(loader.loadTestsFromModule(false_positive))
 
     return suite
-
-
-# ExpectedFailures are bugs, which should be fixed

tests/backup_test.py

@@ -1,9 +1,9 @@
 import unittest
 import os
-import six
 from time import sleep
-from helpers.ptrack_helpers import ProbackupTest, ProbackupException
-from testgres import stop_all
+from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
+from testgres import stop_all, clean_all
+import shutil
 
 
 class BackupTest(ProbackupTest, unittest.TestCase):
@@ -12,10 +12,6 @@ def __init__(self, *args, **kwargs):
         super(BackupTest, self).__init__(*args, **kwargs)
         self.module_name = 'backup'
 
-    @classmethod
-    def tearDownClass(cls):
-        stop_all()
-
     # @unittest.skip("skip")
     # @unittest.expectedFailure
     # PGPRO-707
@@ -39,8 +35,8 @@ def test_backup_modes_archive(self):
         backup_id = self.backup_node(backup_dir, 'node', node)
         show_backup = self.show_pb(backup_dir, 'node')[0]
 
-        self.assertEqual(show_backup['Status'], six.b("OK"))
-        self.assertEqual(show_backup['Mode'], six.b("FULL"))
+        self.assertEqual(show_backup['Status'], "OK")
+        self.assertEqual(show_backup['Mode'], "FULL")
 
         # postmaster.pid and postmaster.opts shouldn't be copied
         excluded = True
@@ -56,8 +52,8 @@ def test_backup_modes_archive(self):
 
         # print self.show_pb(node)
         show_backup = self.show_pb(backup_dir, 'node')[1]
-        self.assertEqual(show_backup['Status'], six.b("OK"))
-        self.assertEqual(show_backup['Mode'], six.b("PAGE"))
+        self.assertEqual(show_backup['Status'], "OK")
+        self.assertEqual(show_backup['Mode'], "PAGE")
 
         # Check parent backup
         self.assertEqual(
@@ -68,15 +64,16 @@ def test_backup_modes_archive(self):
         self.backup_node(backup_dir, 'node', node, backup_type="ptrack")
 
         show_backup = self.show_pb(backup_dir, 'node')[2]
-        self.assertEqual(show_backup['Status'], six.b("OK"))
-        self.assertEqual(show_backup['Mode'], six.b("PTRACK"))
+        self.assertEqual(show_backup['Status'], "OK")
+        self.assertEqual(show_backup['Mode'], "PTRACK")
 
         # Check parent backup
         self.assertEqual(
             page_backup_id,
             self.show_pb(backup_dir, 'node', backup_id=show_backup['ID'])["parent-backup-id"])
 
-        node.stop()
+        # Clean after yourself
+        self.del_test_dir(self.module_name, fname)
 
     # @unittest.skip("skip")
     def test_smooth_checkpoint(self):
@@ -93,9 +90,12 @@ def test_smooth_checkpoint(self):
         node.start()
 
         self.backup_node(backup_dir, 'node' ,node, options=["-C"])
-        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['Status'], six.b("OK"))
+        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['Status'], "OK")
         node.stop()
 
+        # Clean after yourself
+        self.del_test_dir(self.module_name, fname)
+
     #@unittest.skip("skip")
     def test_incremental_backup_without_full(self):
         """page-level backup without validated full backup"""
@@ -115,7 +115,7 @@ def test_incremental_backup_without_full(self):
             # we should die here because exception is what we expect to happen
             self.assertEqual(1, 0, "Expecting Error because page backup should not be possible without valid full backup.\n Output: {0} \n CMD: {1}".format(
                 repr(self.output), self.cmd))
-        except ProbackupException, e:
+        except ProbackupException as e:
             self.assertEqual(e.message,
                 'ERROR: Valid backup on current timeline is not found. Create new FULL backup before an incremental one.\n',
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(e.message), self.cmd))
@@ -127,16 +127,17 @@ def test_incremental_backup_without_full(self):
             # we should die here because exception is what we expect to happen
             self.assertEqual(1, 0, "Expecting Error because page backup should not be possible without valid full backup.\n Output: {0} \n CMD: {1}".format(
                 repr(self.output), self.cmd))
-        except ProbackupException, e:
+        except ProbackupException as e:
             self.assertEqual(e.message,
                 'ERROR: Valid backup on current timeline is not found. Create new FULL backup before an incremental one.\n',
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(e.message), self.cmd))
 
-        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['Status'], six.b("ERROR"))
-        node.stop()
+        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['Status'], "ERROR")
+
+        # Clean after yourself
+        self.del_test_dir(self.module_name, fname)
 
-    @unittest.expectedFailure
-    # Need to forcibly validate parent
+    # @unittest.expectedFailure
     def test_incremental_backup_corrupt_full(self):
         """page-level backup with corrupted full backup"""
         fname = self.id().split('.')[3]
@@ -151,29 +152,37 @@ def test_incremental_backup_corrupt_full(self):
         node.start()
 
         backup_id = self.backup_node(backup_dir, 'node', node)
-        file = os.path.join(backup_dir, "backups", "node", backup_id.decode("utf-8"), "database", "postgresql.conf")
+        file = os.path.join(backup_dir, "backups", "node", backup_id, "database", "postgresql.conf")
         os.remove(file)
 
         try:
-            self.backup_node(backup_dir, 'node', node, backup_type="page")
+            self.validate_pb(backup_dir, 'node')
             # we should die here because exception is what we expect to happen
-            self.assertEqual(1, 0, "Expecting Error because page backup should not be possible without valid full backup.\n Output: {0} \n CMD: {1}".format(
+            self.assertEqual(1, 0, "Expecting Error because of validation of corrupted backup.\n Output: {0} \n CMD: {1}".format(
                 repr(self.output), self.cmd))
-        except ProbackupException, e:
-            self.assertEqual(e.message,
-                'ERROR: Valid backup on current timeline is not found. Create new FULL backup before an incremental one.\n',
-                '\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(e.message), self.cmd))
+        except ProbackupException as e:
+            self.assertTrue("INFO: Validate backups of the instance 'node'\n" in e.message
+                and 'WARNING: Backup file "{0}" is not found\n'.format(file) in e.message
+                and "WARNING: Backup {0} is corrupted\n".format(backup_id) in e.message
+                and "INFO: Some backups are not valid\n" in e.message,
+                "\n Unexpected Error Message: {0}\n CMD: {1}".format(repr(e.message), self.cmd))
 
-            sleep(1)
+        try:
+            self.backup_node(backup_dir, 'node', node, backup_type="page")
+            # we should die here because exception is what we expect to happen
             self.assertEqual(1, 0, "Expecting Error because page backup should not be possible without valid full backup.\n Output: {0} \n CMD: {1}".format(
                 repr(self.output), self.cmd))
-        except ProbackupException, e:
+        except ProbackupException as e:
             self.assertEqual(e.message,
-                'ERROR: Valid backup on current timeline is not found. Create new FULL backup before an incremental one.\n',
-                '\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(e.message), self.cmd))
+                "ERROR: Valid backup on current timeline is not found. Create new FULL backup before an incremental one.\n",
+                "\n Unexpected Error Message: {0}\n CMD: {1}".format(repr(e.message), self.cmd))
 
-        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['Status'], six.b("ERROR"))
-        node.stop()
+        # sleep(1)
+        self.assertEqual(self.show_pb(backup_dir, 'node', backup_id)['status'], "CORRUPT")
+        self.assertEqual(self.show_pb(backup_dir, 'node')[1]['Status'], "ERROR")
+
+        # Clean after yourself
+        self.del_test_dir(self.module_name, fname)
 
     # @unittest.skip("skip")
     def test_ptrack_threads(self):
@@ -190,12 +199,13 @@ def test_ptrack_threads(self):
         node.start()
 
         self.backup_node(backup_dir, 'node', node, backup_type="full", options=["-j", "4"])
-        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['Status'], six.b("OK"))
+        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['Status'], "OK")
 
         self.backup_node(backup_dir, 'node', node, backup_type="ptrack", options=["-j", "4"])
-        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['Status'], six.b("OK"))
+        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['Status'], "OK")
 
-        node.stop()
+        # Clean after yourself
+        self.del_test_dir(self.module_name, fname)
 
     # @unittest.skip("skip")
     def test_ptrack_threads_stream(self):
@@ -213,7 +223,9 @@ def test_ptrack_threads_stream(self):
 
         self.backup_node(backup_dir, 'node', node, backup_type="full", options=["-j", "4", "--stream"])
 
-        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['Status'], six.b("OK"))
+        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['Status'], "OK")
         self.backup_node(backup_dir, 'node', node, backup_type="ptrack", options=["-j", "4", "--stream"])
-        self.assertEqual(self.show_pb(backup_dir, 'node')[1]['Status'], six.b("OK"))
-        node.stop()
+        self.assertEqual(self.show_pb(backup_dir, 'node')[1]['Status'], "OK")
+
+        # Clean after yourself
+        self.del_test_dir(self.module_name, fname)

tests/delete_test.py

@@ -1,9 +1,9 @@
 import unittest
 import os
-import six
-from helpers.ptrack_helpers import ProbackupTest, ProbackupException
-from testgres import stop_all
+from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
+from testgres import stop_all, clean_all
 import subprocess
+import shutil
 
 
 class DeleteTest(ProbackupTest, unittest.TestCase):
@@ -12,10 +12,6 @@ def __init__(self, *args, **kwargs):
         super(DeleteTest, self).__init__(*args, **kwargs)
         self.module_name = 'delete'
 
-    @classmethod
-    def tearDownClass(cls):
-        stop_all()
-
     # @unittest.skip("skip")
     # @unittest.expectedFailure
     def test_delete_full_backups(self):
@@ -55,7 +51,8 @@ def test_delete_full_backups(self):
         self.assertEqual(show_backups[0]['ID'], id_1)
         self.assertEqual(show_backups[1]['ID'], id_3)
 
-        node.stop()
+        # Clean after yourself
+        self.del_test_dir(self.module_name, fname)
 
     def test_delete_increment_page(self):
         """delete increment and all after him"""
@@ -88,12 +85,13 @@ def test_delete_increment_page(self):
         show_backups = self.show_pb(backup_dir, 'node')
         self.assertEqual(len(show_backups), 2)
 
-        self.assertEqual(show_backups[0]['Mode'], six.b("FULL"))
-        self.assertEqual(show_backups[0]['Status'], six.b("OK"))
-        self.assertEqual(show_backups[1]['Mode'], six.b("FULL"))
-        self.assertEqual(show_backups[1]['Status'], six.b("OK"))
+        self.assertEqual(show_backups[0]['Mode'], "FULL")
+        self.assertEqual(show_backups[0]['Status'], "OK")
+        self.assertEqual(show_backups[1]['Mode'], "FULL")
+        self.assertEqual(show_backups[1]['Status'], "OK")
 
-        node.stop()
+        # Clean after yourself
+        self.del_test_dir(self.module_name, fname)
 
     def test_delete_increment_ptrack(self):
         """delete increment and all after him"""
@@ -126,9 +124,10 @@ def test_delete_increment_ptrack(self):
         show_backups = self.show_pb(backup_dir, 'node')
         self.assertEqual(len(show_backups), 2)
 
-        self.assertEqual(show_backups[0]['Mode'], six.b("FULL"))
-        self.assertEqual(show_backups[0]['Status'], six.b("OK"))
-        self.assertEqual(show_backups[1]['Mode'], six.b("FULL"))
-        self.assertEqual(show_backups[1]['Status'], six.b("OK"))
+        self.assertEqual(show_backups[0]['Mode'], "FULL")
+        self.assertEqual(show_backups[0]['Status'], "OK")
+        self.assertEqual(show_backups[1]['Mode'], "FULL")
+        self.assertEqual(show_backups[1]['Status'], "OK")
 
-        node.stop()
+        # Clean after yourself
+        self.del_test_dir(self.module_name, fname)