Changeset 72

Timestamp:

11/29/05 21:32:17 (19 years ago)

Author:

thauvin

Message:

• ensure compress return an error if command failed

Location:

trunk/soft/ObsData

Files:

• ObsData/Archive/Compressed.pm (modified) (2 diffs, 1 prop)
• t/OA-03.t (modified) (2 diffs, 1 prop)
• testdata/wrongcoin.gz (added)

trunk/soft/ObsData/ObsData/Archive/Compressed.pm

@@ -56 +56 @@
     }
 
-    open(my $sourcefh, "$self->{uncomp} '$self->{archive}' |") or return undef;
+    open(my $sourcefh, "$self->{uncomp} '$self->{archive}' 2>/dev/null |") or return undef;
     
     if(!copy($sourcefh, $fh)) {
@@ -64 +64 @@
     }
     
-    close($sourcefh);
     close($fh);
+    if(!close($sourcefh)) {
+        $self->seterror("$self->{uncomp} exit with error" . ($! ? (" " . $!) : ""));
+        unlink($fname);
+        return undef;
+    }
     $fname
 }

trunk/soft/ObsData/t/OA-03.t

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 4;
+use Test::More tests => 6;
 use ObsData::Archive;
 use File::Temp qw(tempdir);
 
 my $tempdir = tempdir;
-print $tempdir . "\n";
 
 my $oa = ObsData::Archive->new('testdata/coin.gz');
@@ -17 +16 @@
 ok(-r "$tempdir/coin", "the file has been really extract");
 
+$oa = ObsData::Archive->new('testdata/wrongcoin.gz');
+ok(!$oa->extract('wrongcoin', "$tempdir/coin"), "Get an error if extraction failed");
+ok($oa->error, "Can get error");
+
 system(qw(rm -fr), $tempdir);