diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-08-11 23:10:53 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-08-11 23:15:33 +0200 |
| commit | 83fa6cffc3be5e89c9c5a992f02366d79aaf0406 (patch) | |
| tree | 91a633e1000171e29e2262b02cfecd81a9d5b72c /tests/network | |
| parent | 18f19b03ab703d0eb09627dcd162ba556316a451 (diff) | |
| download | forums-83fa6cffc3be5e89c9c5a992f02366d79aaf0406.tar forums-83fa6cffc3be5e89c9c5a992f02366d79aaf0406.tar.gz forums-83fa6cffc3be5e89c9c5a992f02366d79aaf0406.tar.bz2 forums-83fa6cffc3be5e89c9c5a992f02366d79aaf0406.tar.xz forums-83fa6cffc3be5e89c9c5a992f02366d79aaf0406.zip | |
[ticket/9297] Make EPSV unit tests work without IPv6.
PHPBB3-9297
Diffstat (limited to 'tests/network')
| -rw-r--r-- | tests/network/ftp_fsock_test.php | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tests/network/ftp_fsock_test.php b/tests/network/ftp_fsock_test.php index c6364f7383..8b97a1c59d 100644 --- a/tests/network/ftp_fsock_test.php +++ b/tests/network/ftp_fsock_test.php @@ -17,20 +17,19 @@ class phpbb_ftp_fsock_test extends phpbb_test_case { public function test_pasv_epsv() { - foreach (dns_get_record('ftp.debian.org', DNS_A | DNS_AAAA) as $row) + $hostname = 'ftp.debian.org.'; + $ipv4 = gethostbyname($hostname); + + if ($ipv4 == $hostname) { - if (isset($row['ip'])) - { - $ipv4 = $row['ip']; - } - else if (isset($row['ipv6'])) - { - $ipv6 = $row['ipv6']; - } + $this->markTestSkipped("Got no A record back from DNS query for $hostname"); } + // PASV $this->assert_ls_contains_debian($ipv4); - $this->assert_ls_contains_debian("[$ipv6]"); + + // EPSV + $this->assert_ls_contains_debian("[::ffff:$ipv4]"); } protected function assert_ls_contains_debian($hostname) |