]> sjero.net Git - wget/commitdiff
Test -i with HTTP.
authorSteven Schubiger <stsc@member.fsf.org>
Fri, 26 Feb 2010 22:07:51 +0000 (23:07 +0100)
committerSteven Schubiger <stsc@member.fsf.org>
Fri, 26 Feb 2010 22:07:51 +0000 (23:07 +0100)
tests/ChangeLog
tests/Makefile.am
tests/Test-i-http.px [new file with mode: 0755]
tests/run-px

index a2b739d5e1598d4e914a72e7d510f29a00424037..17624f0d0f5d9335eb7565e047f259829ea196cd 100644 (file)
@@ -1,3 +1,8 @@
+2010-02-26  Steven Schubiger  <stsc@member.fsf.org>
+
+       * Test-i-http.px: Test --input-file in conjunction with HTTP.
+       * run-px, Makefile.am (EXTRA_DIST): Added Test-i-http.px.
+
 2010-02-25  Steven Schubiger  <stsc@member.fsf.org>
 
        * FTPServer.pm (FTPServer::new): Substitute port placeholders
 2010-02-25  Steven Schubiger  <stsc@member.fsf.org>
 
        * FTPServer.pm (FTPServer::new): Substitute port placeholders
index f1ae27ef14aa4e96965c4c0c7ceb97cfc964c36d..e002b3210743fabb068854864c2b01490935858a 100644 (file)
@@ -84,6 +84,7 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
              Test-HTTP-Content-Disposition-1.px \
              Test-HTTP-Content-Disposition-2.px \
              Test-HTTP-Content-Disposition.px \
              Test-HTTP-Content-Disposition-1.px \
              Test-HTTP-Content-Disposition-2.px \
              Test-HTTP-Content-Disposition.px \
+             Test-i-http.px \
              Test-idn-headers.px \
              Test-idn-meta.px \
              Test-idn-cmd.px \
              Test-idn-headers.px \
              Test-idn-meta.px \
              Test-idn-cmd.px \
diff --git a/tests/Test-i-http.px b/tests/Test-i-http.px
new file mode 100755 (executable)
index 0000000..2425c03
--- /dev/null
@@ -0,0 +1,92 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use HTTPTest;
+
+
+###############################################################################
+
+my $urls = <<EOF;
+http://localhost:{{port}}/site1.html
+http://localhost:{{port}}/site2.html
+EOF
+
+my $site1 = <<EOF;
+<html>
+  <head>
+    <title>Site 1</title>
+  </head>
+  <body>
+    <p>In orci diam, iaculis a hendrerit accumsan, mollis a nibh.</p>
+  </body>
+</html>
+EOF
+
+my $site2 = <<EOF;
+<html>
+  <head>
+    <title>Site 2</title>
+  </head>
+  <body>
+    <p>Sed vehicula ultrices orci a congue. Sed convallis semper urna.</p>
+  </body>
+</html>
+EOF
+
+# code, msg, headers, content
+my %urls = (
+    '/urls.txt' => {
+        code => "200",
+        msg => "Ok",
+        headers => {
+            "Content-type" => "text/plain",
+        },
+        content => $urls,
+    },
+    '/site1.html' => {
+        code => "200",
+        msg => "Ok",
+        headers => {
+            "Content-type" => "text/html",
+        },
+        content => $site1,
+    },
+    '/site2.html' => {
+        code => "200",
+        msg => "Ok",
+        headers => {
+            "Content-type" => "text/html",
+        },
+        content => $site2,
+    },
+);
+
+my $cmdline = $WgetTest::WGETPATH . " -i http://localhost:{{port}}/urls.txt";
+
+my $expected_error_code = 0;
+
+my %expected_downloaded_files = (
+    'urls.txt' => {
+        content => $urls,
+    },
+    'site1.html' => {
+        content => $site1,
+    },
+    'site2.html' => {
+        content => $site2,
+    },
+);
+
+###############################################################################
+
+my $the_test = HTTPTest->new (name => "Test-i-http",
+                              input => \%urls,
+                              cmdline => $cmdline,
+                              errcode => $expected_error_code,
+                              output => \%expected_downloaded_files);
+exit $the_test->run();
+
+# vim: et ts=4 sw=4
+
index 0f058b9e3ec8208646dbb232bac3eb07e6835d1a..6c31dc5e24fd7bc3165b9cfcb86ac2a0b605d67d 100755 (executable)
@@ -37,6 +37,7 @@ my @tests = (
     'Test-HTTP-Content-Disposition-1.px',
     'Test-HTTP-Content-Disposition-2.px',
     'Test-HTTP-Content-Disposition.px',
     'Test-HTTP-Content-Disposition-1.px',
     'Test-HTTP-Content-Disposition-2.px',
     'Test-HTTP-Content-Disposition.px',
+    'Test-i-http.px',
     'Test-idn-headers.px',
     'Test-idn-meta.px',
     'Test-idn-cmd.px',
     'Test-idn-headers.px',
     'Test-idn-meta.px',
     'Test-idn-cmd.px',