summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjvoisin2018-09-05 17:48:14 +0200
committerjvoisin2018-09-05 17:48:14 +0200
commit3649c0ccaff0be765a233beed0b46224d6ac021d (patch)
tree2add264851e20d12122fad679b6705b000ccced8
parent119085f28db71186b5361b6aa8623da2d2ecfd0a (diff)
Remove short version of dangerous/advanced options
-rwxr-xr-xmat24
-rw-r--r--tests/test_climat2.py6
2 files changed, 6 insertions, 4 deletions
diff --git a/mat2 b/mat2
index c7f7a73..2a8ef46 100755
--- a/mat2
+++ b/mat2
@@ -37,11 +37,11 @@ def create_arg_parser():
37 version='MAT2 %s' % __version__) 37 version='MAT2 %s' % __version__)
38 parser.add_argument('-l', '--list', action='store_true', 38 parser.add_argument('-l', '--list', action='store_true',
39 help='list all supported fileformats') 39 help='list all supported fileformats')
40 parser.add_argument('-c', '--check-dependencies', action='store_true', 40 parser.add_argument('--check-dependencies', action='store_true',
41 help='check if MAT2 has all the dependencies it needs') 41 help='check if MAT2 has all the dependencies it needs')
42 parser.add_argument('-V', '--verbose', action='store_true', 42 parser.add_argument('-V', '--verbose', action='store_true',
43 help='show more verbose status information') 43 help='show more verbose status information')
44 parser.add_argument('-u', '--unknown-members', metavar='policy', default='abort', 44 parser.add_argument('--unknown-members', metavar='policy', default='abort',
45 help='how to handle unknown members of archive-style files ' + 45 help='how to handle unknown members of archive-style files ' +
46 '(policy should be abort, omit, or keep)') 46 '(policy should be abort, omit, or keep)')
47 47
diff --git a/tests/test_climat2.py b/tests/test_climat2.py
index 9614347..7d12a03 100644
--- a/tests/test_climat2.py
+++ b/tests/test_climat2.py
@@ -8,14 +8,16 @@ 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] [-V] [-u policy] [-s | -L] [files [files ...]]', 11 self.assertIn(b'usage: mat2 [-h] [-v] [-l] [--check-dependencies] [-V]',
12 stdout) 12 stdout)
13 self.assertIn(b'[--unknown-members policy] [-s | -L]', stdout)
13 14
14 def test_no_arg(self): 15 def test_no_arg(self):
15 proc = subprocess.Popen(['./mat2'], stdout=subprocess.PIPE) 16 proc = subprocess.Popen(['./mat2'], stdout=subprocess.PIPE)
16 stdout, _ = proc.communicate() 17 stdout, _ = proc.communicate()
17 self.assertIn(b'usage: mat2 [-h] [-v] [-l] [-c] [-V] [-u policy] [-s | -L] [files [files ...]]', 18 self.assertIn(b'usage: mat2 [-h] [-v] [-l] [--check-dependencies] [-V]',
18 stdout) 19 stdout)
20 self.assertIn(b'[--unknown-members policy] [-s | -L]', stdout)
19 21
20 22
21class TestVersion(unittest.TestCase): 23class TestVersion(unittest.TestCase):