tests: fixes

Author: gsmolk

tests/validate.py

@@ -3659,7 +3659,7 @@ def test_partial_validate_empty_and_mangled_database_map(self):
         try:
             self.validate_pb(
                 backup_dir, 'node',
-                options=["--db-include=db1", '--no-validate'])
+                options=["--db-include=db1"])
             self.assertEqual(
                 1, 0,
                 "Expecting Error because database_map is empty.\n "
@@ -3680,7 +3680,7 @@ def test_partial_validate_empty_and_mangled_database_map(self):
         try:
             self.validate_pb(
                 backup_dir, 'node',
-                options=["--db-include=db1", '--no-validate'])
+                options=["--db-include=db1"])
             self.assertEqual(
                 1, 0,
                 "Expecting Error because database_map is empty.\n "
@@ -3735,8 +3735,27 @@ def test_partial_validate_exclude(self):
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
 
+        try:
+            self.validate_pb(
+                backup_dir, 'node',
+                options=[
+                    "--db-exclude=db1",
+                    "--db-exclude=db5",
+                    "--log-level-console=verbose"])
+            self.assertEqual(
+                1, 0,
+                "Expecting Error because of missing backup ID.\n "
+                "Output: {0} \n CMD: {1}".format(
+                    self.output, self.cmd))
+        except ProbackupException as e:
+            self.assertIn(
+                "ERROR: You must specify parameter (-i, --backup-id) for partial validation",
+                e.message,
+                '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
+                    repr(e.message), self.cmd))
+
         output = self.validate_pb(
-            backup_dir, 'node',
+            backup_dir, 'node', backup_id,
             options=[
                 "--db-exclude=db1",
                 "--db-exclude=db5",
@@ -3789,7 +3808,7 @@ def test_partial_validate_include(self):
                     repr(e.message), self.cmd))
 
         output = self.validate_pb(
-            backup_dir, 'node',
+            backup_dir, 'node', backup_id,
             options=[
                 "--db-include=db1",
                 "--db-include=db5",
@@ -3800,9 +3819,8 @@ def test_partial_validate_include(self):
             "VERBOSE: Skip file validation due to partial restore", output)
 
         output = self.validate_pb(
-            backup_dir, 'node',
-            options=[
-                "--log-level-console=verbose"])
+            backup_dir, 'node', backup_id,
+            options=["--log-level-console=verbose"])
 
         self.assertNotIn(
             "VERBOSE: Skip file validation due to partial restore", output)