tests: additional fixes for "external" module

gsmolk · gsmolk · commit 1b02f87c1200 · 2019-04-29T16:08:26.000+03:00
diff --git a/tests/external.py b/tests/external.py
@@ -1662,8 +1662,9 @@ def test_external_dir_is_tablespace(self):
                 "\n Output: {0} \n CMD: {1}".format(
                     repr(self.output), self.cmd))
         except ProbackupException as e:
-            self.assertTrue(
-                'External directory path (-E option)' in e.message,
+            self.assertIn(
+                'External directory path (-E option)',
+                e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
 
@@ -1717,8 +1718,9 @@ def test_restore_external_dir_not_empty(self):
                 "\n Output: {0} \n CMD: {1}".format(
                     repr(self.output), self.cmd))
         except ProbackupException as e:
-            self.assertTrue(
-                'External directory is not empty' in e.message,
+            self.assertIn(
+                'External directory is not empty',
+                e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
 
@@ -1742,8 +1744,9 @@ def test_restore_external_dir_not_empty(self):
                 "\n Output: {0} \n CMD: {1}".format(
                     repr(self.output), self.cmd))
         except ProbackupException as e:
-            self.assertTrue(
-                'External directory is not empty' in e.message,
+            self.assertIn(
+                'External directory is not empty',
+                e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
 
@@ -1804,8 +1807,9 @@ def test_restore_external_dir_is_missing(self):
                 "\n Output: {0} \n CMD: {1}".format(
                     repr(self.output), self.cmd))
         except ProbackupException as e:
-            self.assertTrue(
-                'ERROR: External directory is not found: "{0}"'.format(external_dir) in e.message,
+            self.assertIn(
+                'ERROR: External directory is not found:',
+                e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
 
@@ -1890,8 +1894,9 @@ def test_merge_external_dir_is_missing(self):
                 "\n Output: {0} \n CMD: {1}".format(
                     repr(self.output), self.cmd))
         except ProbackupException as e:
-            self.assertTrue(
-                'ERROR: External directory is not found: "{0}"'.format(external_dir) in e.message,
+            self.assertIn(
+                'ERROR: External directory is not found:',
+                external_dir,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
 
