diff options
author | Benoit Foucher <benoit@zeroc.com> | 2009-10-07 18:18:37 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2009-10-07 18:18:37 +0200 |
commit | 5fc2dc27228263e4c56ba3a49852ab3f8c724299 (patch) | |
tree | a1340491094705a1e604a3df22ec4dad0c8d1a8e /cpp/test/IceGrid/replication/run.py | |
parent | Bug 4251 - add IceUtil::Time double initializers (diff) | |
download | ice-5fc2dc27228263e4c56ba3a49852ab3f8c724299.tar.bz2 ice-5fc2dc27228263e4c56ba3a49852ab3f8c724299.tar.xz ice-5fc2dc27228263e4c56ba3a49852ab3f8c724299.zip |
- Bug 4286: added support for IceStorm/IceGrid database plugins
- Fixed IceGrid database code to first save to the database and then
do state changes.
Diffstat (limited to 'cpp/test/IceGrid/replication/run.py')
-rwxr-xr-x | cpp/test/IceGrid/replication/run.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/cpp/test/IceGrid/replication/run.py b/cpp/test/IceGrid/replication/run.py index 7742c5c9f21..12adf8c0d38 100755 --- a/cpp/test/IceGrid/replication/run.py +++ b/cpp/test/IceGrid/replication/run.py @@ -22,7 +22,18 @@ from scripts import * TestUtil.addLdPath(os.getcwd()) -IceGridAdmin.iceGridTest("application.xml", '--IceDir="%s" --TestDir="%s"' % (TestUtil.toplevel, os.getcwd()), - "'properties-override=%s'" % TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "")) +if TestUtil.sqlType != None and TestUtil.sqlType != "QSQLITE": + print "*** This test only supports Freeze or SQLite databases" + sys.exit(0) + +variables = "'properties-override=%s'" % \ + TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "") +if TestUtil.sqlType != None: + variables += " db-plugin=IceGridSqlDB:createSqlDB" +else: + variables += " db-plugin=IceGridFreezeDB:createFreezeDB" + +IceGridAdmin.iceGridTest("application.xml", '--IceDir="%s" --TestDir="%s"' % (TestUtil.toplevel, os.getcwd()), + variables) TestUtil.cleanup() |