diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-04-24 14:16:15 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-04-24 14:16:15 -0700 |
| commit | 943a48fc5c0a59b892eb746073c71b8dd88815e7 (patch) | |
| tree | 421cfedbc60603d02e0b314d9204e9f85dd781c5 /cpp/test/IceGrid/deployer/run.py | |
| parent | minor fix to IcePHP getLogger (diff) | |
| download | ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.tar.bz2 ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.tar.xz ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.zip | |
python 3 support
Diffstat (limited to 'cpp/test/IceGrid/deployer/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/deployer/run.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/test/IceGrid/deployer/run.py b/cpp/test/IceGrid/deployer/run.py index 20ca3c73a22..6f66f393364 100755 --- a/cpp/test/IceGrid/deployer/run.py +++ b/cpp/test/IceGrid/deployer/run.py @@ -16,9 +16,9 @@ if len(head) > 0: path = [os.path.join(head, p) for p in path] path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] if len(path) == 0: - raise "can't find toplevel directory!" -sys.path.append(os.path.join(path[0])) -from scripts import * + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil, IceGridAdmin os.environ["MY_FOO"] = "12" @@ -27,4 +27,3 @@ IceGridAdmin.iceGridTest("application.xml", '--TestDir="%s"' % os.getcwd(), "ice # Tests with targets IceGridAdmin.iceGridTest("application.xml", '-t --TestDir="%s"' % os.getcwd(), "icebox.exe='%s' moreservers moreservices moreproperties" % TestUtil.getIceBox()) - |