summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmat24
-rw-r--r--tests/test_climat2.py11
2 files changed, 3 insertions, 12 deletions
diff --git a/mat2 b/mat2
index d2a083a..7c7b652 100755
--- a/mat2
+++ b/mat2
@@ -38,10 +38,8 @@ def create_arg_parser():
38 help='list all supported fileformats') 38 help='list all supported fileformats')
39 39
40 info = parser.add_mutually_exclusive_group() 40 info = parser.add_mutually_exclusive_group()
41 info.add_argument('-c', '--check', action='store_true',
42 help='check if a file is free of harmful metadatas')
43 info.add_argument('-s', '--show', action='store_true', 41 info.add_argument('-s', '--show', action='store_true',
44 help='list all the harmful metadata of a file without removing them') 42 help='list harmful metadata detectable by MAT2 without removing them')
45 info.add_argument('-L', '--lightweight', action='store_true', 43 info.add_argument('-L', '--lightweight', action='store_true',
46 help='remove SOME metadata') 44 help='remove SOME metadata')
47 return parser 45 return parser
diff --git a/tests/test_climat2.py b/tests/test_climat2.py
index a119884..9948057 100644
--- a/tests/test_climat2.py
+++ b/tests/test_climat2.py
@@ -8,12 +8,12 @@ class TestHelp(unittest.TestCase):
8 def test_help(self): 8 def test_help(self):
9 proc = subprocess.Popen(['./mat2', '--help'], stdout=subprocess.PIPE) 9 proc = subprocess.Popen(['./mat2', '--help'], stdout=subprocess.PIPE)
10 stdout, _ = proc.communicate() 10 stdout, _ = proc.communicate()
11 self.assertIn(b'usage: mat2 [-h] [-v] [-l] [-c | -s | -L] [files [files ...]]', stdout) 11 self.assertIn(b'usage: mat2 [-h] [-v] [-l] [-s | -L] [files [files ...]]', stdout)
12 12
13 def test_no_arg(self): 13 def test_no_arg(self):
14 proc = subprocess.Popen(['./mat2'], stdout=subprocess.PIPE) 14 proc = subprocess.Popen(['./mat2'], stdout=subprocess.PIPE)
15 stdout, _ = proc.communicate() 15 stdout, _ = proc.communicate()
16 self.assertIn(b'usage: mat2 [-h] [-v] [-l] [-c | -s | -L] [files [files ...]]', stdout) 16 self.assertIn(b'usage: mat2 [-h] [-v] [-l] [-s | -L] [files [files ...]]', stdout)
17 17
18 18
19class TestVersion(unittest.TestCase): 19class TestVersion(unittest.TestCase):
@@ -23,13 +23,6 @@ class TestVersion(unittest.TestCase):
23 self.assertTrue(stdout.startswith(b'MAT2 ')) 23 self.assertTrue(stdout.startswith(b'MAT2 '))
24 24
25 25
26class TestExclusiveArgs(unittest.TestCase):
27 def test_version(self):
28 proc = subprocess.Popen(['./mat2', '-s', '-c'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
29 stdout, stderr = proc.communicate()
30 self.assertIn(b'mat2: error: argument -c/--check: not allowed with argument -s/--show', stderr)
31
32
33class TestReturnValue(unittest.TestCase): 26class TestReturnValue(unittest.TestCase):
34 def test_nonzero(self): 27 def test_nonzero(self):
35 ret = subprocess.call(['./mat2', './mat2'], stdout=subprocess.DEVNULL) 28 ret = subprocess.call(['./mat2', './mat2'], stdout=subprocess.DEVNULL)