TEST: Test remove_ext, tweak imrm test

tests/test_scripts/test_imrm.py

@@ -13,7 +13,7 @@ import fsl.scripts.imrm as imrm
 from tests import touch
 
 def test_imrm_usage():
-    assert imrm.main(['imrm']) != 0
+    assert imrm.main([]) != 0
 
 
 def test_imrm():
@@ -45,6 +45,7 @@ def test_imrm():
             print('command',  command)
             print('expected', expected)
 
-            imrm.main(('imrm ' + command).split())
+            ret = imrm.main(('imrm ' + command).split())
 
+            assert ret == 0
             assert sorted(os.listdir()) == sorted(expected.split())

tests/test_scripts/test_remove_ext.py

+#!/usr/bin/env python
+#
+# test_remove_ext.py -
+#
+# Author: Paul McCarthy <pauldmccarthy@gmail.com>
+#
+
+
+import fsl.scripts.remove_ext as remove_ext
+
+from tests import CaptureStdout
+
+def test_usage():
+    assert remove_ext.main([]) != 0
+
+def test_remove_ext():
+    # (input, expected output)
+    tests = [
+        ('a',                 'a'),
+        ('a.nii',             'a'),
+        ('a.nii.gz',          'a'),
+        ('a.txt',             'a.txt'),
+        ('a.nii b.img c.hdr', 'a b c'),
+        ('a.nii b.img b.hdr', 'a b b'),
+        ('a b.img c.txt',     'a b c.txt'),
+        ('a.nii.gz b c.mnc',  'a b c'),
+    ]
+
+    for input, expected in tests:
+
+        cap = CaptureStdout()
+        with cap:
+            ret = remove_ext.main(input.split())
+
+        assert ret == 0
+
+        got = cap.stdout.split()
+        assert sorted(got) == sorted(expected.split())