Merge branch 'master' of github.com:DiamondLightSource/Savu

DiamondLightSource · Feb 10, 2016 · 33f8bea · 33f8bea
2 parents fb20633 + 155d77a
commit 33f8bea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/savu/test/scikit_image_recon_test.py b/savu/test/scikit_image_recon_test.py
@@ -32,11 +32,11 @@
 @unittest.skip('Runs as a standalone test but not in the suite. Error to be investigated')
 class PluginRunnerScikitImageTest(unittest.TestCase):
 
-    def test_fbp(self):
-        options = tu.set_experiment('tomo')
-        plugin = 'savu.plugins.reconstructions.' + \
-            'scikitimage_filter_back_projection'
-        run_protected_plugin_runner_no_process_list(options, plugin)
+#     def test_fbp(self):
+#         options = tu.set_experiment('tomo')
+#         plugin = 'savu.plugins.reconstructions.' + \
+#             'scikitimage_filter_back_projection'
+#         run_protected_plugin_runner_no_process_list(options, plugin)
 
     def test_process(self):
         options = {

diff --git a/savu/test/simple_stxm_tomo_test.py b/savu/test/simple_stxm_tomo_test.py
@@ -34,7 +34,7 @@ def test_process(self):
         options = {
             "transport": "hdf5",
             "process_names": "CPU0",
-            "data_file": "/dls/i13/data/2015/cm12165-5/processing/AskAaron/mmbig_58905.nxs",#tu.get_test_data_path('mm.nxs'),
+            "data_file": tu.get_test_data_path('mm.nxs'),
             "process_file": tu.get_test_process_path(
                 'simple_stxm_tomo_test_astra.nxs'),
             "out_path": tempfile.mkdtemp()