diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-17 15:48:26 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-17 15:48:26 +0100 |
| commit | cade94b03f44c09a65542d58746e111a997477c1 (patch) | |
| tree | 47c62bd60c8fa62587c271d5e16de711bf973243 /cpp/test/IceGrid/session/run.py | |
| parent | Added OS X Frameworks (diff) | |
| download | ice-cade94b03f44c09a65542d58746e111a997477c1.tar.bz2 ice-cade94b03f44c09a65542d58746e111a997477c1.tar.xz ice-cade94b03f44c09a65542d58746e111a997477c1.zip | |
Fixed ICE-4968 - Support for 1.0 observers with IceGrid
Diffstat (limited to 'cpp/test/IceGrid/session/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/session/run.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py index 00c9d18d088..8f45d842295 100755 --- a/cpp/test/IceGrid/session/run.py +++ b/cpp/test/IceGrid/session/run.py @@ -34,6 +34,8 @@ if not os.path.exists(node1Dir): else: IceGridAdmin.cleanDbDir(node1Dir) +print("Running test with default encoding...") + sys.stdout.write("starting admin permissions verifier... ") verifierProc = TestUtil.startServer(os.path.join(os.getcwd(), "verifier"), config=TestUtil.DriverConfig("server")) print("ok") @@ -52,3 +54,15 @@ IceGridAdmin.iceGridTest("application.xml", 'properties-override=\'%s\'' % IceGridAdmin.iceGridNodePropertiesOverride()) verifierProc.waitTestSuccess() + +print("Running test with 1.0 encoding...") + +sys.stdout.write("starting admin permissions verifier... ") +verifierProc = TestUtil.startServer(os.path.join(os.getcwd(), "verifier"), config=TestUtil.DriverConfig("server")) +print("ok") + +IceGridAdmin.iceGridTest("application.xml", + '--Ice.Default.EncodingVersion=1.0 --IceBinDir="%s" --TestDir="%s"' % (TestUtil.getCppBinDir(), os.getcwd()), + 'properties-override=\'%s\'' % IceGridAdmin.iceGridNodePropertiesOverride()) + +verifierProc.waitTestSuccess() |