TEST: Simplify, reformat test_data

Author: effigies

nibabel/tests/test_data.py

@@ -157,8 +157,7 @@ def test_data_path(with_nimd_env):
         with open(tmpfile, 'wt') as fobj:
             fobj.write('[DATA]\n')
             fobj.write('path = %s\n' % '/path/two')
-        assert (get_data_path() ==
-                     tst_list + ['/path/two'] + old_pth)
+        assert get_data_path() == tst_list + ['/path/two'] + old_pth
 
 
 def test_find_data_dir():
@@ -201,10 +200,10 @@ def test_make_datasource(with_nimd_env):
         assert ds.version == '0.1'
 
 
+@pytest.mark.xfail(raises=DataError)
 def test_bomber():
-    with pytest.raises(DataError):
-        b = Bomber('bomber example', 'a message')
-        b.any_attribute  # no error
+    b = Bomber('bomber example', 'a message')
+    b.any_attribute  # no error
 
 
 def test_bomber_inspect():
@@ -213,13 +212,12 @@ def test_bomber_inspect():
 
 
 def test_datasource_or_bomber(with_nimd_env):
-    pkg_def = dict(
-        relpath='pkg')
+    pkg_def = dict(relpath='pkg')
     with TemporaryDirectory() as tmpdir:
         nibd.get_data_path = lambda: [tmpdir]
         ds = datasource_or_bomber(pkg_def)
         with pytest.raises(DataError):
-            getattr(ds, 'get_filename')
+            ds.get_filename('some_file.txt')
         pkg_dir = pjoin(tmpdir, 'pkg')
         os.mkdir(pkg_dir)
         tmpfile = pjoin(pkg_dir, 'config.ini')
@@ -235,4 +233,4 @@ def test_datasource_or_bomber(with_nimd_env):
         pkg_def['min version'] = '0.3'
         ds = datasource_or_bomber(pkg_def)  # not OK
         with pytest.raises(DataError):
-            getattr(ds, 'get_filename')
+            ds.get_filename('some_file.txt')