From 99bca82fda275792f1ceb18d44151909cde8e630 Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@stfc.ac.uk>
Date: Tue, 17 Mar 2015 14:03:02 +0000
Subject: [PATCH] Remove requirement for test to write to disk
This should help with eliminating random failures when running the tests
in parallel.
Refs #11306
---
.../test/python/mantid/SimpleAPITest.py | 90 ++++++-------------
1 file changed, 26 insertions(+), 64 deletions(-)
diff --git a/Code/Mantid/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py b/Code/Mantid/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
index 82700d24e27..f2bfb1f7a92 100644
--- a/Code/Mantid/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
+++ b/Code/Mantid/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
@@ -4,37 +4,6 @@ from mantid.api import (AlgorithmFactory, AlgorithmProxy, IAlgorithm, IEventWork
import mantid.simpleapi as simpleapi
import numpy
-import os
-import subprocess
-import sys
-
-#======================================================================================================================
-# Helper class for test
-class TemporaryPythonAlgorithm(object):
- """
- Dumps the given code to a file in the Python algorithm directory
- an removes the file in the del method
- """
- def __init__(self, name, code):
- from mantid import config
-
- plugin_dirs = config['python.plugins.directories'].split(";")
- if len(plugin_dirs) == 0:
- raise RuntimeError("No Python algorithm directories defined")
-
- self._pyfile = os.path.join(plugin_dirs[0], name + ".py")
- alg_file = open(self._pyfile, "w")
- alg_file.write(code)
- alg_file.close()
-
- def __del__(self):
- try:
- os.remove(self._pyfile)
- pycfile = self._pyfile.replace(".py",".pyc")
- os.remove(pycfile)
- except OSError:
- pass
-
#======================================================================================================================
class SimpleAPITest(unittest.TestCase):
@@ -219,41 +188,34 @@ FullBinsOnly(Input) *boolean* Omit the final bin if it's width is smaller
self.assertTrue('raw' in mtd)
def test_python_alg_can_use_other_python_alg_through_simple_api(self):
- """
- Runs a test in a separate process as it requires a reload of the
- whole mantid module
- """
- src = """
-from mantid.api import PythonAlgorithm, AlgorithmFactory
-import mantid.simpleapi as api
-from mantid.simpleapi import *
-
-class %(name)s(PythonAlgorithm):
+ class SimpleAPIPythonAlgorithm1(PythonAlgorithm):
+ def PyInit(self):
+ pass
+ def PyExec(self):
+ from mantid.simpleapi import SimpleAPIPythonAlgorithm2
+ SimpleAPIPythonAlgorithm2()
+ class SimpleAPIPythonAlgorithm2(PythonAlgorithm):
+ def PyInit(self):
+ pass
+ def PyExec(self):
+ pass
- def PyInit(self):
- pass
- def PyExec(self):
- %(execline1)s
- %(execline2)s
-
-AlgorithmFactory.subscribe(%(name)s)
-"""
- name1 = "SimpleAPIPythonAlgorithm1"
- name2 = "SimpleAPIPythonAlgorithm2"
- src1 = src % {"name":name1,"execline1":name2+"()","execline2":"api."+name2+"()"}
- src2 = src % {"name":name2,"execline1":"pass","execline2":"pass"}
- a = TemporaryPythonAlgorithm(name1,src1)
- b = TemporaryPythonAlgorithm(name2,src2)
- # Try to use algorithm 1 to run algorithm 2
- cmd = sys.executable + ' -c "from mantid.simpleapi import %(name)s;%(name)s()"' % {'name':name1}
+ AlgorithmFactory.subscribe(SimpleAPIPythonAlgorithm1)
+ AlgorithmFactory.subscribe(SimpleAPIPythonAlgorithm2)
+ # ---------------------------------------------------------
+ alg1 = SimpleAPIPythonAlgorithm1()
+ alg1.initialize()
+ # Puts function in simpleapi globals
+ simpleapi_alg1_func = simpleapi._create_algorithm_function("SimpleAPIPythonAlgorithm1", 1, alg1)
+ alg2 = SimpleAPIPythonAlgorithm1()
+ alg2.initialize()
+ # Puts function in simpleapi globals
+ simpleapi._create_algorithm_function("SimpleAPIPythonAlgorithm2", 1, alg2)
try:
- subprocess.check_call(cmd,shell=True)
- except subprocess.CalledProcessError, exc:
- self.fail("Error occurred running one Python algorithm from another: %s" % str(exc))
-
- # Ensure the files are removed promptly
- del a,b
-
+ simpleapi_alg1_func()
+ except RuntimeError, exc:
+ self.fail("Running algorithm 2 from 1 failed: " + str(exc))
+
def test_optional_workspaces_are_ignored_if_not_present_in_output_even_if_given_as_input(self):
# Test algorithm
from mantid.api import AlgorithmManager,PropertyMode,PythonAlgorithm,MatrixWorkspaceProperty,WorkspaceFactory
--
GitLab