diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-05-26 14:51:10 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-05-26 14:51:10 +0200 |
| commit | 67d75b52476f0cbccdd1a182be8af7dcfe78e355 (patch) | |
| tree | 5ebfab1788fc03f6dc81dbe6ca81e4c525f23207 /scripts/tests | |
| parent | Added support for stripping out invalid XML characters from the JUnit XML fil... (diff) | |
| download | ice-67d75b52476f0cbccdd1a182be8af7dcfe78e355.tar.bz2 ice-67d75b52476f0cbccdd1a182be8af7dcfe78e355.tar.xz ice-67d75b52476f0cbccdd1a182be8af7dcfe78e355.zip | |
Support for components in test script
Diffstat (limited to 'scripts/tests')
| -rw-r--r-- | scripts/tests/IceBox/admin.py | 4 | ||||
| -rw-r--r-- | scripts/tests/IceBox/configuration.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/tests/IceBox/admin.py b/scripts/tests/IceBox/admin.py index 93d47189989..c194e32bf99 100644 --- a/scripts/tests/IceBox/admin.py +++ b/scripts/tests/IceBox/admin.py @@ -24,8 +24,8 @@ class IceBoxAdminTestCase(ClientServerTestCase): current.writeln("ok") TestSuite(__name__, [ - ClientServerTestCase(server=IceBox(args=['--Ice.Config="{testdir}/config.icebox{iceboxconfigext}"'])), - IceBoxAdminTestCase("iceboxadmin", server=IceBox(args=['--Ice.Config="{testdir}/config.icebox{iceboxconfigext}"'])), + ClientServerTestCase(server=IceBox("{testdir}/config.icebox")), + IceBoxAdminTestCase("iceboxadmin", server=IceBox("{testdir}/config.icebox")), ], libDirs=["testservice"], runOnMainThread=True, diff --git a/scripts/tests/IceBox/configuration.py b/scripts/tests/IceBox/configuration.py index 02cc5537a92..e895844f3c9 100644 --- a/scripts/tests/IceBox/configuration.py +++ b/scripts/tests/IceBox/configuration.py @@ -9,6 +9,6 @@ # ********************************************************************** TestSuite(__name__, [ - ClientServerTestCase("client/server #1", server=IceBox(args=['--Ice.Config="{testdir}/config.icebox{iceboxconfigext}"'])), - ClientServerTestCase("client/server #2", server=IceBox(args=['--Ice.Config="{testdir}/config.icebox2{iceboxconfigext}"'])) + ClientServerTestCase("client/server #1", server=IceBox("{testdir}/config.icebox")), + ClientServerTestCase("client/server #2", server=IceBox("{testdir}/config.icebox2")) ], libDirs=["testservice"], runOnMainThread=True, options={ "protocol" : ["tcp"], "ipv6" : [False], "mx" : [False] }, multihost=False) |