Merge pull request #323 from nno/_enh/surfing_test_remove_hdf5

TST+ENH: use the filename provided by @with_tempfile decorator (Closes #322)

mvpa2/tests/test_surfing.py

@@ -880,7 +880,7 @@ def sum_ds(ds):
         assert_array_equal(r.samples, m.samples)
 
 
-    @with_tempfile('.h5py', 'qe')
+    @with_tempfile('.h5py', '_qe')
     def test_surf_queryengine(self, qefn):
         s = surf.generate_plane((0, 0, 0), (0, 1, 0), (0, 0, 1), 4, 5)
 
@@ -908,10 +908,8 @@ def test_surf_queryengine(self, qefn):
 
             # test i/o and ensure that the untrained instance is not trained
             if externals.exists('h5py'):
-                fd, qefn = tempfile.mkstemp('qe.hdf5', 'test'); os.close(fd)
                 h5save(qefn, qe)
                 qe = h5load(qefn)
-                os.remove(qefn)
 
 
             # untrained qe should give errors