Changeset 17876 for src/router/proftpd/tests/t/lib/ProFTPD/Tests/Config/MaxRetrieveFileSize.pm

Timestamp:

11/11/11 13:17:43 (20 months ago)

Author:

BrainSlayer

Message:

update proftp

File:

• src/router/proftpd/tests/t/lib/ProFTPD/Tests/Config/MaxRetrieveFileSize.pm (modified) (4 diffs)

src/router/proftpd/tests/t/lib/ProFTPD/Tests/Config/MaxRetrieveFileSize.pm

@@ -2 +2 @@
 
 use lib qw(t/lib);
-use base qw(Test::Unit::TestCase ProFTPD::TestSuite::Child);
+use base qw(ProFTPD::TestSuite::Child);
 use strict;
 
-use File::Path qw(mkpath rmtree);
 use File::Spec;
 use IO::Handle;
@@ -36 +35 @@
   return testsuite_get_runnable_tests($TESTS);
 }
-
-sub set_up {
-  my $self = shift;
-  $self->{tmpdir} = testsuite_get_tmp_dir();
-
-  # Create temporary scratch dir
-  eval { mkpath($self->{tmpdir}) };
-  if ($@) {
-    my $abs_path = File::Spec->rel2abs($self->{tmpdir});
-    die("Can't create dir $abs_path: $@");
-  }
-}
-
-sub tear_down {
-  my $self = shift;
-
-  # Remove temporary scratch dir
-  if ($self->{tmpdir}) {
-    eval { rmtree($self->{tmpdir}) };
-  }
-
-  undef $self;
-};
 
 sub maxretrievefilesize_ok {
@@ -152 +128 @@
 
       my $buf;
-      $conn->read($buf, 8192);
-      $conn->close();
+      $conn->read($buf, 8192, 30);
+      eval { $conn->close() };
 
       my $expected;
@@ -286 +262 @@
 
       my $buf;
-      $conn->read($buf, 8192);
-      $conn->close();
+      $conn->read($buf, 8192, 30);
+      eval { $conn->close() };
 
       $resp_code = $client->response_code();