Commit 4c15133d authored by Gabriel Monnerat's avatar Gabriel Monnerat

fix package name

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk/utils@44947 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4fd17dd9
...@@ -64,8 +64,8 @@ class TestUnoConverter(HandlerTestCase): ...@@ -64,8 +64,8 @@ class TestUnoConverter(HandlerTestCase):
mimemapper_pickled = json.dumps(mimemapper) mimemapper_pickled = json.dumps(mimemapper)
python = join(self.office_binary_path, "python") python = join(self.office_binary_path, "python")
command = [exists(python) and python or "python", command = [exists(python) and python or "python",
pkg_resources.resource_filename("cloudooo", pkg_resources.resource_filename("cloudooo.handler.ooo",
"handler/ooo/helper/unoconverter.py"), "/helper/unoconverter.py"),
"--convert", "--convert",
"--uno_path=%s" % self.uno_path, "--uno_path=%s" % self.uno_path,
"--office_binary_path=%s" % self.office_binary_path, "--office_binary_path=%s" % self.office_binary_path,
......
...@@ -41,6 +41,7 @@ class TestUnoMimeMapper(HandlerTestCase): ...@@ -41,6 +41,7 @@ class TestUnoMimeMapper(HandlerTestCase):
def afterSetUp(self): def afterSetUp(self):
""" """ """ """
self.package_namespace = "cloudooo.handler.ooo"
environ['uno_path'] = '' environ['uno_path'] = ''
environ['office_binary_path'] = '' environ['office_binary_path'] = ''
openoffice.acquire() openoffice.acquire()
...@@ -56,8 +57,8 @@ class TestUnoMimeMapper(HandlerTestCase): ...@@ -56,8 +57,8 @@ class TestUnoMimeMapper(HandlerTestCase):
hostname, host = openoffice.getAddress() hostname, host = openoffice.getAddress()
python = path.join(self.office_binary_path, "python") python = path.join(self.office_binary_path, "python")
command = [path.exists(python) and python or "python", command = [path.exists(python) and python or "python",
pkg_resources.resource_filename("cloudooo", pkg_resources.resource_filename(self.package_namespace,
"handler/ooo/helper/unomimemapper.py"), "/helper/unomimemapper.py"),
"--uno_path=%s" % self.uno_path, "--uno_path=%s" % self.uno_path,
"--office_binary_path=%s" % self.office_binary_path, "--office_binary_path=%s" % self.office_binary_path,
"--hostname=%s" % self.hostname, "--hostname=%s" % self.hostname,
...@@ -79,8 +80,8 @@ class TestUnoMimeMapper(HandlerTestCase): ...@@ -79,8 +80,8 @@ class TestUnoMimeMapper(HandlerTestCase):
""" Test call unomimemapper without uno_path and office_binary_path""" """ Test call unomimemapper without uno_path and office_binary_path"""
hostname, host = openoffice.getAddress() hostname, host = openoffice.getAddress()
command = [path.join(self.office_binary_path, "python"), command = [path.join(self.office_binary_path, "python"),
pkg_resources.resource_filename("cloudooo", pkg_resources.resource_filename(self.package_namespace,
"handler/ooo/helper/unomimemapper.py"), "/helper/unomimemapper.py"),
"--hostname=%s" % self.hostname, "--hostname=%s" % self.hostname,
"--port=%s" % self.openoffice_port] "--port=%s" % self.openoffice_port]
stdout, stderr = Popen(command, stdout, stderr = Popen(command,
...@@ -103,8 +104,8 @@ class TestUnoMimeMapper(HandlerTestCase): ...@@ -103,8 +104,8 @@ class TestUnoMimeMapper(HandlerTestCase):
openoffice.stop() openoffice.stop()
python = path.join(self.office_binary_path, "python") python = path.join(self.office_binary_path, "python")
command = [path.exists(python) and python or "python", command = [path.exists(python) and python or "python",
pkg_resources.resource_filename("cloudooo", pkg_resources.resource_filename(self.package_namespace,
"handler/ooo/helper/unomimemapper.py"), "/helper/unomimemapper.py"),
"--uno_path=%s" % self.uno_path, "--uno_path=%s" % self.uno_path,
"--office_binary_path=%s" % self.office_binary_path, "--office_binary_path=%s" % self.office_binary_path,
"--hostname=%s" % self.hostname, "--hostname=%s" % self.hostname,
......
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