Ref https://github.com/jvoisin/mat2/commit/05f34a17695be65b1ad9782911f87e000de8fc8b Ref https://github.com/jvoisin/mat2/commit/a69429ce94d739be3dcccc0efeb19820812ac5f4 --- a/tests/test_climat2.py +++ b/tests/test_climat2.py @@ -24,10 +24,11 @@ class TestHelp(unittest.TestCase): self.assertIn(b'mat2 [-h] [-V]', stdout) self.assertIn(b'[--unknown-members policy]', stdout) self.assertIn(b'[--inplace]', stdout) - self.assertIn(b' [-v] [-l]', stdout) - self.assertIn(b'[--check-dependencies]', stdout) + self.assertIn(b'-v', stdout) + self.assertIn(b'-l', stdout) + self.assertIn(b'--check-dependencies', stdout) self.assertIn(b'[-L | -s]', stdout) - self.assertIn(b'[files ...]', stdout) + self.assertIn(b'files ...', stdout) def test_no_arg(self): proc = subprocess.Popen(mat2_binary, stdout=subprocess.PIPE) @@ -35,11 +36,11 @@ class TestHelp(unittest.TestCase): self.assertIn(b'mat2 [-h] [-V]', stdout) self.assertIn(b'[--unknown-members policy]', stdout) self.assertIn(b'[--inplace]', stdout) - self.assertIn(b' [-v]', stdout) - self.assertIn(b'[-l]', stdout) - self.assertIn(b'[--check-dependencies]', stdout) + self.assertIn(b'-v', stdout) + self.assertIn(b'-l', stdout) + self.assertIn(b'--check-dependencies', stdout) self.assertIn(b'[-L | -s]', stdout) - self.assertIn(b'[files ...]', stdout) + self.assertIn(b'files ...', stdout) class TestVersion(unittest.TestCase): @@ -223,6 +224,7 @@ class TestGetMeta(unittest.TestCase): stdout, _ = proc.communicate() self.assertIn(b'Warning: [minor] Improper EXIF header', stdout) +@unittest.skip("glycin doesn't like some jpg") class TestControlCharInjection(unittest.TestCase): def test_jpg(self): proc = subprocess.Popen(mat2_binary + ['--show', './tests/data/control_chars.jpg'], --- a/tests/test_corrupted_files.py +++ b/tests/test_corrupted_files.py @@ -188,15 +188,6 @@ class TestCorruptedFiles(unittest.TestCase): audio.MP3Parser('./tests/data/clean.mp3') os.remove('./tests/data/clean.mp3') - def test_wrong_tif(self): - shutil.copy('./tests/data/dirty.tiff', './tests/data/clean.tif') - p = images.TiffParser('./tests/data/clean.tif') - p.remove_all() - p = images.TiffParser('./tests/data/clean.cleaned.tif') - self.assertEqual(p.get_meta(), {}) - os.remove('./tests/data/clean.tif') - os.remove('./tests/data/clean.cleaned.tif') - def test_jpg(self): shutil.copy('./tests/data/dirty.mp3', './tests/data/clean.jpg') with self.assertRaises(ValueError):