Commit 3039ec7a authored by Rafael Monnerat's avatar Rafael Monnerat

Propagate env configuration to testOooOpenOffice

parent 6682da8c
...@@ -43,7 +43,8 @@ class TestOpenOffice(HandlerTestCase): ...@@ -43,7 +43,8 @@ class TestOpenOffice(HandlerTestCase):
self.working_path, self.working_path,
self.office_binary_path, self.office_binary_path,
self.uno_path, self.uno_path,
'en') 'en',
self.environment_dict)
self.openoffice.start() self.openoffice.start()
def tearDown(self): def tearDown(self):
...@@ -94,7 +95,8 @@ class TestOpenOffice(HandlerTestCase): ...@@ -94,7 +95,8 @@ class TestOpenOffice(HandlerTestCase):
self.working_path, self.working_path,
self.office_binary_path, self.office_binary_path,
self.uno_path, self.uno_path,
'en') 'en',
self.environment_dict)
second_openoffice.start() second_openoffice.start()
self.assertEquals(self.openoffice.status(), False) self.assertEquals(self.openoffice.status(), False)
self.assertTrue(second_openoffice.status()) self.assertTrue(second_openoffice.status())
...@@ -106,7 +108,8 @@ class TestOpenOffice(HandlerTestCase): ...@@ -106,7 +108,8 @@ class TestOpenOffice(HandlerTestCase):
self.working_path, self.working_path,
self.office_binary_path, self.office_binary_path,
self.uno_path, self.uno_path,
'en') 'en',
self.environment_dict)
second_openoffice.start() second_openoffice.start()
self.assertTrue(self.openoffice.status()) self.assertTrue(self.openoffice.status())
self.assertTrue(second_openoffice.status()) self.assertTrue(second_openoffice.status())
......
...@@ -128,6 +128,10 @@ class HandlerTestCase(unittest.TestCase): ...@@ -128,6 +128,10 @@ class HandlerTestCase(unittest.TestCase):
self.tmp_url = path.join(self.working_path, "tmp") self.tmp_url = path.join(self.working_path, "tmp")
check_folder(self.working_path, self.tmp_url) check_folder(self.working_path, self.tmp_url)
self.uno_path = config.get("app:main", "uno_path") self.uno_path = config.get("app:main", "uno_path")
self.environment_dict = {}
for item in config.options("app:main"):
if item.startswith("env-"):
self.environment_dict[item[4:].upper()] = config.get("app:main", item)
self.afterSetUp() self.afterSetUp()
def afterSetUp(self): def afterSetUp(self):
......
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