[svk-commit] r2729 - trunk/t

[nobody at bestpractical.com]

Author: clkao
Date: Thu Apr 17 02:44:22 2008
New Revision: 2729

Modified:
   trunk/t/50dav.t

Log:
fix 50dav for 1.5 error output.

Modified: trunk/t/50dav.t
==============================================================================
--- trunk/t/50dav.t	(original)
+++ trunk/t/50dav.t	Thu Apr 17 02:44:22 2008
@@ -38,6 +38,7 @@
 
 my $cfg = Apache::TestConfig->new
     ( top_dir => $apache_root,
+      src_dir => $ENV{APACHE_MODULE_DIR},
       t_dir => $apache_root,
       apxs => $apxs,
  )->httpd_config;
@@ -55,6 +56,7 @@
 		 qq{DAV svn\n    SVNPath $srepospath\n});
 $cfg->generate_httpd_conf;
 my $server = $cfg->server;
+
 $server->start;
 ok ($server->ping, 'server is alive');
 
@@ -132,8 +134,10 @@
 	   ['Waiting for editor...',
 	    'Commit into mirrored path: merging back directly.',
 	    "Merging back to mirror source $uri/A.",
-	    qr"RA layer request failed: OPTIONS request failed on '/svn/A': OPTIONS of '/svn/A': .*",
-	    qr'Commit message saved in (.*)\.']);
+	    qr'Commit message saved in (.*)\.',
+	    qr"RA layer request failed: OPTIONS.*/svn/A.*",
+           ]);
+
 ($filename) = $output =~ m/saved in (.*)\./s;
 is_file_content ($filename, "from editor\n");