--- a/configurationengine/source/plugins/example/integration-test/unittest_generate.py Fri Mar 12 08:30:17 2010 +0200
+++ b/configurationengine/source/plugins/example/integration-test/unittest_generate.py Tue Aug 10 14:29:28 2010 +0300
@@ -16,7 +16,7 @@
#
import sys, os, shutil, unittest
-import __init__
+
from testautomation.base_testcase import BaseTestCase
from testautomation import zip_dir
@@ -25,7 +25,7 @@
if sys.platform == "win32":
CONE_SCRIPT = "cone.cmd"
else:
- CONE_SCRIPT = "cone.sh"
+ CONE_SCRIPT = "cone"
def get_cmd(action='generate'):
"""Return the command used to run the ConE sub-action"""
@@ -77,7 +77,7 @@
self.run_command(cmd)
EXPECTED_DIR = os.path.join(ROOT_PATH, "testdata/generate/expected")
- self.assert_dir_contents_equal('output', EXPECTED_DIR, ['.svn'])
+ self.assert_dir_contents_equal(os.path.join(workdir,'output'), EXPECTED_DIR, ['.svn'])
finally:
os.chdir(orig_workdir)