diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-08-04 19:18:45 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-08-04 19:18:45 -0230 |
| commit | d9c568300c2aed6ab736026ea116b3f1a72fbe43 (patch) | |
| tree | 27191ba2b0d1ef43256561da01462b98c7bd696d /demoscript/IceBox/hello.py | |
| parent | Merge branch 'R3_3_branch' of ssh://cvs.zeroc.com/home/git/ice into R3_3_branch (diff) | |
| download | ice-d9c568300c2aed6ab736026ea116b3f1a72fbe43.tar.bz2 ice-d9c568300c2aed6ab736026ea116b3f1a72fbe43.tar.xz ice-d9c568300c2aed6ab736026ea116b3f1a72fbe43.zip | |
Numerous cleanups to the test suite and expect scripts.
Conflicts:
cpp/test/Glacier2/staticFiltering/run.py
Diffstat (limited to 'demoscript/IceBox/hello.py')
| -rwxr-xr-x | demoscript/IceBox/hello.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demoscript/IceBox/hello.py b/demoscript/IceBox/hello.py index 11cf23a206c..4f611174de9 100755 --- a/demoscript/IceBox/hello.py +++ b/demoscript/IceBox/hello.py @@ -9,7 +9,7 @@ # ********************************************************************** import sys, demoscript -import demoscript.Expect as Expect +from scripts import Expect def runtests(client, server, secure): print "testing twoway", |