Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1b02f87

Browse files
committed
tests: additional fixes for "external" module
1 parentcbfb496 commit1b02f87

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

‎tests/external.py‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,8 +1662,9 @@ def test_external_dir_is_tablespace(self):
16621662
"\n Output: {0}\n CMD: {1}".format(
16631663
repr(self.output),self.cmd))
16641664
exceptProbackupExceptionase:
1665-
self.assertTrue(
1666-
'External directory path (-E option)'ine.message,
1665+
self.assertIn(
1666+
'External directory path (-E option)',
1667+
e.message,
16671668
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
16681669
repr(e.message),self.cmd))
16691670

@@ -1717,8 +1718,9 @@ def test_restore_external_dir_not_empty(self):
17171718
"\n Output: {0}\n CMD: {1}".format(
17181719
repr(self.output),self.cmd))
17191720
exceptProbackupExceptionase:
1720-
self.assertTrue(
1721-
'External directory is not empty'ine.message,
1721+
self.assertIn(
1722+
'External directory is not empty',
1723+
e.message,
17221724
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
17231725
repr(e.message),self.cmd))
17241726

@@ -1742,8 +1744,9 @@ def test_restore_external_dir_not_empty(self):
17421744
"\n Output: {0}\n CMD: {1}".format(
17431745
repr(self.output),self.cmd))
17441746
exceptProbackupExceptionase:
1745-
self.assertTrue(
1746-
'External directory is not empty'ine.message,
1747+
self.assertIn(
1748+
'External directory is not empty',
1749+
e.message,
17471750
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
17481751
repr(e.message),self.cmd))
17491752

@@ -1804,8 +1807,9 @@ def test_restore_external_dir_is_missing(self):
18041807
"\n Output: {0}\n CMD: {1}".format(
18051808
repr(self.output),self.cmd))
18061809
exceptProbackupExceptionase:
1807-
self.assertTrue(
1808-
'ERROR: External directory is not found: "{0}"'.format(external_dir)ine.message,
1810+
self.assertIn(
1811+
'ERROR: External directory is not found:',
1812+
e.message,
18091813
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
18101814
repr(e.message),self.cmd))
18111815

@@ -1890,8 +1894,9 @@ def test_merge_external_dir_is_missing(self):
18901894
"\n Output: {0}\n CMD: {1}".format(
18911895
repr(self.output),self.cmd))
18921896
exceptProbackupExceptionase:
1893-
self.assertTrue(
1894-
'ERROR: External directory is not found: "{0}"'.format(external_dir)ine.message,
1897+
self.assertIn(
1898+
'ERROR: External directory is not found:',
1899+
external_dir,
18951900
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
18961901
repr(e.message),self.cmd))
18971902

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp