[Erp5-report] r44947 gabriel - /erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Mar 31 23:39:29 CEST 2011
Author: gabriel
Date: Thu Mar 31 23:39:29 2011
New Revision: 44947
URL: http://svn.erp5.org?rev=44947&view=rev
Log:
fix package name
Modified:
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUnoConverter.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUnoMimemapper.py
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUnoConverter.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUnoConverter.py?rev=44947&r1=44946&r2=44947&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUnoConverter.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUnoConverter.py [utf8] Thu Mar 31 23:39:29 2011
@@ -64,8 +64,8 @@ class TestUnoConverter(HandlerTestCase):
mimemapper_pickled = json.dumps(mimemapper)
python = join(self.office_binary_path, "python")
command = [exists(python) and python or "python",
- pkg_resources.resource_filename("cloudooo",
- "handler/ooo/helper/unoconverter.py"),
+ pkg_resources.resource_filename("cloudooo.handler.ooo",
+ "/helper/unoconverter.py"),
"--convert",
"--uno_path=%s" % self.uno_path,
"--office_binary_path=%s" % self.office_binary_path,
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUnoMimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUnoMimemapper.py?rev=44947&r1=44946&r2=44947&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUnoMimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUnoMimemapper.py [utf8] Thu Mar 31 23:39:29 2011
@@ -41,6 +41,7 @@ class TestUnoMimeMapper(HandlerTestCase)
def afterSetUp(self):
""" """
+ self.package_namespace = "cloudooo.handler.ooo"
environ['uno_path'] = ''
environ['office_binary_path'] = ''
openoffice.acquire()
@@ -56,8 +57,8 @@ class TestUnoMimeMapper(HandlerTestCase)
hostname, host = openoffice.getAddress()
python = path.join(self.office_binary_path, "python")
command = [path.exists(python) and python or "python",
- pkg_resources.resource_filename("cloudooo",
- "handler/ooo/helper/unomimemapper.py"),
+ pkg_resources.resource_filename(self.package_namespace,
+ "/helper/unomimemapper.py"),
"--uno_path=%s" % self.uno_path,
"--office_binary_path=%s" % self.office_binary_path,
"--hostname=%s" % self.hostname,
@@ -79,8 +80,8 @@ class TestUnoMimeMapper(HandlerTestCase)
""" Test call unomimemapper without uno_path and office_binary_path"""
hostname, host = openoffice.getAddress()
command = [path.join(self.office_binary_path, "python"),
- pkg_resources.resource_filename("cloudooo",
- "handler/ooo/helper/unomimemapper.py"),
+ pkg_resources.resource_filename(self.package_namespace,
+ "/helper/unomimemapper.py"),
"--hostname=%s" % self.hostname,
"--port=%s" % self.openoffice_port]
stdout, stderr = Popen(command,
@@ -103,8 +104,8 @@ class TestUnoMimeMapper(HandlerTestCase)
openoffice.stop()
python = path.join(self.office_binary_path, "python")
command = [path.exists(python) and python or "python",
- pkg_resources.resource_filename("cloudooo",
- "handler/ooo/helper/unomimemapper.py"),
+ pkg_resources.resource_filename(self.package_namespace,
+ "/helper/unomimemapper.py"),
"--uno_path=%s" % self.uno_path,
"--office_binary_path=%s" % self.office_binary_path,
"--hostname=%s" % self.hostname,
More information about the Erp5-report
mailing list