[Bps-public-commit] r16211 - in sd/trunk: . lib/App/SD

[sartak at bestpractical.com]

Author: sartak
Date: Fri Oct  3 13:22:14 2008
New Revision: 16211

Modified:
   sd/trunk/   (props changed)
   sd/trunk/lib/App/SD/Test.pm
   sd/trunk/t/sd-hm.t

Log:
 r73531 at onn:  sartak | 2008-10-03 13:21:58 -0400
 The "id" fields are no longer guaranteed to be the first line, so lighten the regexes a bit to fix test failures


Modified: sd/trunk/lib/App/SD/Test.pm
==============================================================================
--- sd/trunk/lib/App/SD/Test.pm	(original)
+++ sd/trunk/lib/App/SD/Test.pm	Fri Oct  3 13:22:14 2008
@@ -64,7 +64,7 @@
 sub get_uuid_for_luid {
         my $luid = shift;
     my ($ok, $out, $err) =  Prophet::Test::run_script( 'sd', [ 'ticket', 'show', '--batch', '--id', $luid ]);
-    if ($out =~ /^id: \d+ \((.*)\)/) {
+    if ($out =~ /^id: \d+ \((.*)\)/m) {
             return $1;
     }
     return undef;
@@ -81,7 +81,7 @@
 sub get_luid_for_uuid {
         my $uuid = shift;
     my ($ok, $out, $err) =  Prophet::Test::run_script( 'sd', [ 'ticket', 'show', '--batch', '--id', $uuid ]);
-    if ($out =~ /^id: (\d+)/) {
+    if ($out =~ /^id: (\d+)/m) {
             return $1;
     }
     return undef;

Modified: sd/trunk/t/sd-hm.t
==============================================================================
--- sd/trunk/t/sd-hm.t	(original)
+++ sd/trunk/t/sd-hm.t	Fri Oct  3 13:22:14 2008
@@ -56,7 +56,7 @@
 
 
 ( $ret, $out, $err ) = run_script( 'sd', [ 'ticket', 'show', '--batch', '--id', $flyman_uuid ] );
-if ($out =~ /^id: (\d+) /) {
+if ($out =~ /^id: (\d+) /m) {
     $flyman_id = $1;
 }