Commit ff9d30b
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -26,7 +26,7 @@ def run(argv): | |||
| 26 | 26 | ||
| 27 | 27 | out, err = p.communicate() | |
| 28 | 28 | ||
| 29 | - return out.decode('ascii'), err.decode('ascii') | ||
| 29 | + return out.decode('ascii'), err.decode('ascii'), p.returncode | ||
| 30 | 30 | ||
| 31 | 31 | def temp(content): | |
| 32 | 32 | f = tempfile.NamedTemporaryFile() | |
@@ -41,21 +41,24 @@ class TestUnidecodeUtility(unittest.TestCase): | |||
| 41 | 41 | ||
| 42 | 42 | def test_encoding_error(self): | |
| 43 | 43 | f = temp(self.TEST_UNICODE.encode('sjis')) | |
| 44 | - out, err = run(['-e', 'utf8', f.name]) | ||
| 44 | + out, err, rc = run(['-e', 'utf8', f.name]) | ||
| 45 | 45 | ||
| 46 | 46 | # Text after : ... can differ between Python versions | |
| 47 | 47 | self.assertRegex(err, '^Unable to decode input: ') | |
| 48 | + self.assertEqual(rc, 1) | ||
| 48 | 49 | ||
| 49 | 50 | def test_file_specified_encoding(self): | |
| 50 | 51 | f = temp(self.TEST_UNICODE.encode('sjis')) | |
| 51 | 52 | ||
| 52 | - out, err = run(['-e', 'sjis', f.name]) | ||
| 53 | + out, err, rc = run(['-e', 'sjis', f.name]) | ||
| 53 | 54 | self.assertEqual(out, self.TEST_ASCII) | |
| 55 | + self.assertEqual(rc, 0) | ||
| 54 | 56 | ||
| 55 | 57 | def test_file_default_encoding(self): | |
| 56 | 58 | f = temp(self.TEST_UNICODE.encode(locale.getpreferredencoding())) | |
| 57 | - out, err = run([f.name]) | ||
| 59 | + out, err, rc = run([f.name]) | ||
| 58 | 60 | self.assertEqual(out, self.TEST_ASCII) | |
| 61 | + self.assertEqual(rc, 0) | ||
| 59 | 62 | ||
| 60 | 63 | def test_file_stdin(self): | |
| 61 | 64 | cmd = get_cmd() | |
@@ -65,5 +68,6 @@ def test_file_stdin(self): | |||
| 65 | 68 | self.assertEqual(out.decode('ascii'), self.TEST_ASCII) | |
| 66 | 69 | ||
| 67 | 70 | def test_commandline(self): | |
| 68 | - out = run(['-e', 'sjis', '-c', self.TEST_UNICODE.encode('sjis')])[0] | ||
| 71 | + out, err, rc = run(['-e', 'sjis', '-c', self.TEST_UNICODE.encode('sjis')]) | ||
| 69 | 72 | self.assertEqual(out, self.TEST_ASCII + '\n') | |
| 73 | + self.assertEqual(rc, 0) | ||
0 commit comments