tests: fixes for #280

Author: gsmolk

tests/backup.py

@@ -973,7 +973,7 @@ def test_basic_tablespace_handling(self):
         self.add_instance(backup_dir, 'node', node)
         node.slow_start()
 
-        self.backup_node(
+        backup_id = self.backup_node(
             backup_dir, 'node', node, backup_type="full",
             options=["-j", "4", "--stream"])
 
@@ -1028,9 +1028,10 @@ def test_basic_tablespace_handling(self):
                 "\n Output: {0} \n CMD: {1}".format(
                     repr(self.output), self.cmd))
         except ProbackupException as e:
-            self.assertTrue(
-                'ERROR: --tablespace-mapping option' in e.message and
-                'have an entry in tablespace_map file' in e.message,
+            self.assertIn(
+                'ERROR: Backup {0} has no tablespaceses, '
+                'nothing to remap'.format(backup_id),
+                e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
 
@@ -1144,7 +1145,7 @@ def test_tablespace_handling_2(self):
         tblspace1_old_path = self.get_tblspace_path(node, 'tblspace1_old')
         tblspace_new_path = self.get_tblspace_path(node, 'tblspace_new')
 
-        self.backup_node(
+        backup_id = self.backup_node(
             backup_dir, 'node', node, backup_type="full",
             options=["-j", "4", "--stream"])
 
@@ -1166,9 +1167,9 @@ def test_tablespace_handling_2(self):
                 "\n Output: {0} \n CMD: {1}".format(
                     repr(self.output), self.cmd))
         except ProbackupException as e:
-            self.assertTrue(
-                'ERROR: --tablespace-mapping option' in e.message and
-                'have an entry in tablespace_map file' in e.message,
+            self.assertIn(
+                'ERROR: Backup {0} has no tablespaceses, '
+                'nothing to remap'.format(backup_id), e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
 

tests/incr_restore.py

@@ -460,7 +460,7 @@ def test_incr_restore_with_tablespace_4(self):
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
             self.assertIn(
-                'ERROR: Incremental restore is impossible',
+                'ERROR: Incremental restore is not allowed',
                 e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
@@ -692,7 +692,7 @@ def test_basic_incr_restore_sanity(self):
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
             self.assertIn(
-                'ERROR: Incremental restore is impossible',
+                'ERROR: Incremental restore is not allowed',
                 e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
@@ -717,7 +717,7 @@ def test_basic_incr_restore_sanity(self):
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
             self.assertIn(
-                'ERROR: Incremental restore is impossible',
+                'ERROR: Incremental restore is not allowed',
                 e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))

tests/restore.py

@@ -868,7 +868,7 @@ def test_restore_with_tablespace_mapping_1(self):
                     repr(self.output), self.cmd))
         except ProbackupException as e:
             self.assertIn(
-                'ERROR: restore tablespace destination is not empty:',
+                'ERROR: Restore tablespace destination is not empty:',
                 e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
@@ -891,7 +891,7 @@ def test_restore_with_tablespace_mapping_1(self):
                     repr(self.output), self.cmd))
         except ProbackupException as e:
             self.assertIn(
-                'ERROR: restore tablespace destination is not empty:',
+                'ERROR: Restore tablespace destination is not empty:',
                 e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
@@ -1109,10 +1109,6 @@ def test_restore_with_missing_or_corrupted_tablespace_map(self):
 
         with open(tablespace_map, "a") as f:
             f.write("HELLO\n")
-        
-        print(tablespace_map)
-
-        exit(1)
 
         try:
             self.restore_node(