From bd357b85f866c8377f1d2a71f09ec2f4223c1592 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 9 Jul 2018 00:13:16 +0200
Subject: [PATCH] Remove a useless option that was never implemented anyway
---
mat2 | 4 +---
tests/test_climat2.py | 11 ++---------
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():
help='list all supported fileformats')
info = parser.add_mutually_exclusive_group()
- info.add_argument('-c', '--check', action='store_true',
- help='check if a file is free of harmful metadatas')
info.add_argument('-s', '--show', action='store_true',
- help='list all the harmful metadata of a file without removing them')
+ help='list harmful metadata detectable by MAT2 without removing them')
info.add_argument('-L', '--lightweight', action='store_true',
help='remove SOME metadata')
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):
def test_help(self):
proc = subprocess.Popen(['./mat2', '--help'], stdout=subprocess.PIPE)
stdout, _ = proc.communicate()
- self.assertIn(b'usage: mat2 [-h] [-v] [-l] [-c | -s | -L] [files [files ...]]', stdout)
+ self.assertIn(b'usage: mat2 [-h] [-v] [-l] [-s | -L] [files [files ...]]', stdout)
def test_no_arg(self):
proc = subprocess.Popen(['./mat2'], stdout=subprocess.PIPE)
stdout, _ = proc.communicate()
- self.assertIn(b'usage: mat2 [-h] [-v] [-l] [-c | -s | -L] [files [files ...]]', stdout)
+ self.assertIn(b'usage: mat2 [-h] [-v] [-l] [-s | -L] [files [files ...]]', stdout)
class TestVersion(unittest.TestCase):
@@ -23,13 +23,6 @@ class TestVersion(unittest.TestCase):
self.assertTrue(stdout.startswith(b'MAT2 '))
-class TestExclusiveArgs(unittest.TestCase):
- def test_version(self):
- proc = subprocess.Popen(['./mat2', '-s', '-c'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- stdout, stderr = proc.communicate()
- self.assertIn(b'mat2: error: argument -c/--check: not allowed with argument -s/--show', stderr)
-
-
class TestReturnValue(unittest.TestCase):
def test_nonzero(self):
ret = subprocess.call(['./mat2', './mat2'], stdout=subprocess.DEVNULL)
--
GitLab