Use BaseUtils::Python::import_bornagain in all tests

Base/Py/PyUtils.cpp

@@ -68,10 +68,10 @@ std::string BaseUtils::Python::toString(wchar_t* c)
     return std::string(wstr.begin(), wstr.end());
 }
 
-void BaseUtils::Python::import_bornagain(const std::vector<std::string>& paths)
+PyObject* BaseUtils::Python::import_bornagain(const std::vector<std::string>& paths)
 {
     if (Py_IsInitialized())
-        return;
+        return nullptr;
 
     Py_InitializeEx(0); // like Py_Initialize, but skip registration of signal handlers
 
@@ -97,6 +97,8 @@ void BaseUtils::Python::import_bornagain(const std::vector<std::string>& paths)
 #ifndef _WIN32
     PyOS_setsig(SIGINT, sighandler);
 #endif
+
+    return pmod;
 }
 
 std::string BaseUtils::Python::pythonRuntimeInfo()

Base/Py/PyUtils.h

@@ -42,7 +42,7 @@ std::string toString(char* c);
 std::string toString(wchar_t* c);
 
 //! Imports BornAgain from given location. If path is empty, tries to rely on PYTHONPATH.
-void import_bornagain(const std::vector<std::string>& paths = {});
+PyObject* import_bornagain(const std::vector<std::string>& paths = {});
 
 //! Returns multi-line string representing PATH, PYTHONPATH, sys.path and other info.
 std::string pythonRuntimeInfo();

Tests/Functional/PyEmbedded/Tests.cpp

@@ -79,15 +79,7 @@ TEST_F(PyEmbedded, ImportNumpy)
 
 TEST_F(PyEmbedded, FunctionCall)
 {
-    Py_Initialize();
-
-    PyObject* sysPath = PySys_GetObject((char*)"path");
-    PyList_Append(sysPath, PyString_FromString("."));
-    PyList_Append(sysPath, PyString_FromString(BABuild::buildLibDir().c_str()));
-
-    PyObject* pmod = PyImport_ImportModule("bornagain");
-    if (!pmod)
-        throw std::runtime_error("Can't load module");
+    PyObject* pmod = BaseUtils::Python::import_bornagain({".", BABuild::buildLibDir()});
 
     PyObject* pfun = PyObject_GetAttrString(pmod, "GetVersionNumber");
     Py_DecRef(pmod);
@@ -261,14 +253,7 @@ TEST_F(PyEmbedded, CompiledFunction)
 
 TEST_F(PyEmbedded, ObjectExtract)
 {
-    Py_Initialize();
-
-    PyObject* sysPath = PySys_GetObject((char*)"path");
-    PyList_Append(sysPath, PyString_FromString(BABuild::buildLibDir().c_str()));
-
-    PyObject* pmod = PyImport_ImportModule("bornagain");
-    if (!pmod)
-        throw std::runtime_error("Can't load bornagain");
+    PyObject* pmod = BaseUtils::Python::import_bornagain({BABuild::buildLibDir()});
 
     PyObject* ml = PyObject_GetAttrString(pmod, "MultiLayer");
     Py_DecRef(pmod);