Kaydet (Commit) 98282064 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Demystify magic ponies

Change-Id: I7e619daf8743d3471ece72d81f6cf1bb61741646
üst 70c8b456
...@@ -14,7 +14,7 @@ class InsertRemoveCells(unittest.TestCase): ...@@ -14,7 +14,7 @@ class InsertRemoveCells(unittest.TestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.xContext = pyuno.getComponentContext() cls.xContext = pyuno.getComponentContext()
pyuno.experimentalExtraMagic() pyuno.private_initTestEnvironment()
# no need for a tearDown(cls) method. # no need for a tearDown(cls) method.
......
...@@ -319,7 +319,7 @@ static PyObject* getComponentContext( ...@@ -319,7 +319,7 @@ static PyObject* getComponentContext(
return ret.getAcquired(); return ret.getAcquired();
} }
static PyObject* initPoniesMode( static PyObject* initTestEnvironment(
SAL_UNUSED_PARAMETER PyObject*, SAL_UNUSED_PARAMETER PyObject*) SAL_UNUSED_PARAMETER PyObject*, SAL_UNUSED_PARAMETER PyObject*)
{ {
// this tries to bootstrap enough of the soffice from python to run // this tries to bootstrap enough of the soffice from python to run
...@@ -841,7 +841,7 @@ static PyObject *setCurrentContext( ...@@ -841,7 +841,7 @@ static PyObject *setCurrentContext(
struct PyMethodDef PyUNOModule_methods [] = struct PyMethodDef PyUNOModule_methods [] =
{ {
{"experimentalExtraMagic", initPoniesMode, METH_VARARGS, NULL}, {"private_initTestEnvironment", initTestEnvironment, METH_VARARGS, NULL},
{"getComponentContext", getComponentContext, METH_VARARGS, NULL}, {"getComponentContext", getComponentContext, METH_VARARGS, NULL},
{"_createUnoStructHelper", reinterpret_cast<PyCFunction>(createUnoStructHelper), METH_VARARGS | METH_KEYWORDS, NULL}, {"_createUnoStructHelper", reinterpret_cast<PyCFunction>(createUnoStructHelper), METH_VARARGS | METH_KEYWORDS, NULL},
{"getTypeByName", getTypeByName, METH_VARARGS, NULL}, {"getTypeByName", getTypeByName, METH_VARARGS, NULL},
......
...@@ -175,7 +175,7 @@ class UnoInProcess: ...@@ -175,7 +175,7 @@ class UnoInProcess:
return self.xDoc return self.xDoc
def setUp(self): def setUp(self):
self.xContext = pyuno.getComponentContext() self.xContext = pyuno.getComponentContext()
pyuno.experimentalExtraMagic() pyuno.private_initTestEnvironment()
def openEmptyWriterDoc(self): def openEmptyWriterDoc(self):
assert(self.xContext) assert(self.xContext)
smgr = self.getContext().ServiceManager smgr = self.getContext().ServiceManager
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment