Squashed commit of the following:

commit d74cec9e6c77e70b33883f517b1bb6f97b2ffa5e
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:33:06 2007 +0800

    updates.

commit 643b31f979a00ea5397206ca59f20bb58c62660e
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:32:35 2007 +0800

    added some .gitignore rules.

commit 1510d38798976753b435f32308e79acd9fcd2722
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:05:10 2007 +0800

    removed bogus use of 127.0.0.1

commit 3c91e89b01af20a0dacfdbc1fbeca1c67c796656
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:01:43 2007 +0800

    Verify that cygwin python is used under Windows.

commit ff160725c051eedb28a42d9dd69f0d8aa297e522
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:55:03 2007 +0800

    bump timeout for the node to terminate. killing the node leaves the servers running under cygwin

commit ec3bddb58e861f906bf39aee1fa818c3e9a50000
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:48:55 2007 +0800

    added back accidently removed files.

commit f9ea2f552d7f576ebfa878669925f4184a89257b
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:47:47 2007 +0800

    http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2427, http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2422

commit 8a309ca0036dba7ecbd577edb2d737fa41174a5a
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 10:06:53 2007 +0800

    added ruby support to the expect scripts.

commit 34597c1ee6d80d6754c9e925bd376125dd104a5f
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 09:26:10 2007 +0800

    added pexpect to git repository.

commit 4bd2e1f2b52bcb9906b03ac216db686b8229b545
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 18:49:51 2007 +0800

    numerous UNIX expect script fixes.

commit 25ab4a812f45a6e908d5d2d7ab03e557d79afa9f
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 16:47:08 2007 +0800

    generate configuration files for IceGrid icebox/iceboxd

commit 6bb57bf7ed21d7256963c228aaf0b20657367a47
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 15:16:55 2007 +0800

    added python & C# support to the expect scripts.

commit 08f1a59971ad3a52a4357069554dcc309b2d062b
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Wed Aug 22 14:23:53 2007 +0800

    java expect scripts complete.

commit 3918f4ff3beea3005001bc55c5502c0825d8b7ea
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Wed Aug 22 13:30:31 2007 +0800

    first set of expect changes.

1 files changed, 15 insertions, 12 deletions

diff --git a/cpp/demo/Freeze/backup/expect.py b/cpp/demo/Freeze/backup/expect.py
index 1b37cdc5718..98c530a84e8 100755
--- a/cpp/demo/Freeze/backup/expect.py
+++ b/cpp/demo/Freeze/backup/expect.py
@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 
-import pexpect, sys, os
+import sys, os
 
 try:
     import demoscript
@@ -23,7 +23,9 @@ except ImportError:
     import demoscript
 
 import demoscript.Util
+demoscript.Util.defaultLanguage = "C++"
 import signal, time
+import demoscript.pexpect as pexpect
 
 print "cleaning databases...",
 sys.stdout.flush()
@@ -49,8 +51,7 @@ print "performing full backup...",
 sys.stdout.flush()
 backup = demoscript.Util.spawn('./backup full')
 backup.expect('hot backup started', timeout=30)
-backup.expect(pexpect.EOF, timeout=30)
-assert backup.wait() == 0
+backup.waitTestSuccess(timeout=30)
 print "ok"
 
 print "sleeping 5s...",
@@ -62,7 +63,7 @@ print "performing incremental backup...",
 sys.stdout.flush()
 backup = demoscript.Util.spawn('./backup incremental')
 backup.expect('hot backup started', timeout=30)
-backup.expect(pexpect.EOF, timeout=30)
+backup.waitTestSuccess(timeout=30)
 print "ok"
 
 print "sleeping 30s...",
@@ -76,7 +77,8 @@ print "killing client with SIGTERM...",
 sys.stdout.flush()
 client.kill(signal.SIGTERM)
 client.expect(pexpect.EOF, timeout=30)
-assert client.wait() != 0
+client.wait()
+assert client.signalstatus == signal.SIGTERM
 print "ok"
 
 print "Client output: ",
@@ -88,9 +90,9 @@ os.system('rm -fr db/data/* db/logs/* db/__*')
 os.system('cp -Rp hotbackup/* db')
 sys.stdout.flush()
 
-rclient = demoscript.Util.spawn('./client')
-rclient.expect('(.*)Updating map', timeout=60)
-assert rclient.match.group(1).find('Creating new map') == -1
+client = demoscript.Util.spawn('./client')
+client.expect('(.*)Updating map', timeout=60)
+assert client.match.group(1).find('Creating new map') == -1
 print "ok"
 
 print "sleeping 5s...",
@@ -99,10 +101,11 @@ time.sleep(5)
 print "ok"
 
 print "killing client with SIGTERM...",
-rclient.kill(signal.SIGTERM)
-rclient.expect(pexpect.EOF, timeout=30)
-assert rclient.wait() != 0
+client.kill(signal.SIGTERM)
+client.expect(pexpect.EOF, timeout=30)
+client.wait()
+assert client.signalstatus == signal.SIGTERM
 print "ok"
 
 print "Restarted client output:",
-print "%s " % (rclient.before)
+print "%s " % (client.before)