[Rt-commit] r12112 - in rt/branches/3.8-TESTING: . t/web

[alexmv at bestpractical.com]

Author: alexmv
Date: Tue May  6 16:01:33 2008
New Revision: 12112

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in
   rt/branches/3.8-TESTING/t/web/command_line.t

Log:
 r31291 at kohr-ah:  chmrr | 2008-05-06 16:00:57 -0400
  * Bump deps, make command line not hang


Modified: rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in
==============================================================================
--- rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in	(original)
+++ rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in	Tue May  6 16:01:33 2008
@@ -276,12 +276,12 @@
 WWW::Mechanize
 Test::WWW::Mechanize 1.04
 Module::Refresh 0.03
-Test::Expect 0.30
+Test::Expect 0.31
 XML::Simple
 File::Find
 Test::Deep 0 # needed for shredder tests
 String::ShellQuote 0 # needed for gnupg-incoming.t
-Test::HTTP::Server::Simple
+Test::HTTP::Server::Simple 0.8
 Log::Dispatch::Perl
 Test::Warn
 Test::Builder 0.77 # needed to fix TODO test

Modified: rt/branches/3.8-TESTING/t/web/command_line.t
==============================================================================
--- rt/branches/3.8-TESTING/t/web/command_line.t	(original)
+++ rt/branches/3.8-TESTING/t/web/command_line.t	Tue May  6 16:01:33 2008
@@ -345,10 +345,9 @@
     # root takes the ticket
     expect_send("take $steal_ticket_id", 'root takes the ticket...');
     expect_like(qr/Owner changed from Nobody to root/, 'root took the ticket');
+    expect_quit();
 
     # log in as the non-root user
-    #expect_quit();      # this is apparently unnecessary, but I'll leave it in
-                         # until I'm sure
     $ENV{'RTUSER'} = "fooser$$";
     $ENV{'RTPASSWD'} = 'foobar';
     expect_run( command => "$rt_tool_path shell", prompt => 'rt> ', quit => 'quit',);
@@ -368,9 +367,9 @@
     expect_like(qr/Owner changed from root to fooser$$/, '...and succeeds!');
     expect_send("show ticket/$steal_ticket_id -f owner", 'Double-checking...');
     expect_like(qr/Owner: fooser$$/, '...yup, it worked.');
+    expect_quit();
 
     # log back in as root
-    #expect_quit();     # ditto
     $ENV{'RTUSER'} = 'root';
     $ENV{'RTPASSWD'} = 'password';
     expect_run( command => "$rt_tool_path shell", prompt => 'rt> ', quit => 'quit',);
@@ -407,6 +406,8 @@
     }
 # }}}
 
+expect_quit(); # We need to do this ourselves, so that we quit
+               # *before* we tear down the webserver.
 
 # helper function
 sub ok_create_ticket {