[Monotone-commits-diffs] org.debian.monotone: 3748d25bd05926a80129890aa867c8c63cf33c15

[code]

revision:            3748d25bd05926a80129890aa867c8c63cf33c15
date:                2013-03-15T19:44:21
author:              address@hidden
branch:              org.debian.monotone
changelog:
Add work-around to skip a test in case we are behind a broken DNS
gateway. Closes: #671080.

manifest:
format_version "1"

new_manifest [4b13afe563b3a24ef6b04e90f252de3c648bc2e4]

old_revision [f9a26ba1748a5b6ca59cccf7e71c132c0933a85b]

add_file "patches/06-broken-dns-work-around.diff"
 content [20357fa33ad157dab9602406fc79c4816e1b9f9d]

patch "changelog"
 from [c1faba0ae1936683a59fabc288d1182d1c1373e1]
   to [652f5075a08d2142f7d67aa97fb0a87baec5e66f]

patch "patches/series"
 from [21552d38083621973eba28cf85926d9d8dfa72d9]
   to [0946c8c7d30085fedbd436c8622718ecfab0b444]
============================================================
--- changelog	c1faba0ae1936683a59fabc288d1182d1c1373e1
+++ changelog	652f5075a08d2142f7d67aa97fb0a87baec5e66f
@@ -5,6 +5,8 @@ monotone (1.0-7) experimental; urgency=l
     patches/05-hurd-compilation-fix.diff. Closes: #624779.
   * Add Brazilian Portuguese translation by Adriano Rafael Gomes.
     Closes: #693378.
+  * Add work-around to skip a test in case we are behind a broken DNS
+    gateway. Closes: #671080.
   * Standards-Version: 3.9.4 (no changes required).
   * Drop build dependency on quilt.
 
============================================================
--- /dev/null	
+++ patches/06-broken-dns-work-around.diff	20357fa33ad157dab9602406fc79c4816e1b9f9d
@@ -0,0 +1,31 @@
+Description: work-around to skip a test in case we are behind a broken DNS
+ Checks a domain that's supposed to be inexistent and skips a test that
+ fails in case a broken DNS tries to be helpful and resolves such an
+ inexistent name.
+Bug-Debian: http://bugs.debian.org/671080
+Origin: upstream, commit: 7b87eec0dc2298a18531b95c1cd2d1b72986e71c
+--- a/test/func/netsync_badhost_gives_nice_error/__driver__.lua
++++ b/test/func/netsync_badhost_gives_nice_error/__driver__.lua
+@@ -1,3 +1,22 @@
++skip_if(not existsonpath("host"))
++
++-- We punt in case of misconfigured DNS servers that resolve inexistant
++-- domain names. (Don't even think about buying that domain name!)
++L("\nChecking DNS resolution for nosuchhost__blahblah__asdvasoih.com: ")
++local pid = spawn_redirected("", "host-lookup.out", "host-lookup.err",
++                             "host", "nosuchhost__blahblah__asdvasoih.com")
++local ec = wait(pid)
++
++if ec == 0 then
++  L("failed\n",
++    "\n",
++    "Your DNS resolver is trying to be helpful by resolving names that do\n",
++    "not exist. `host nosuchhost__blahblah__asdvasoih.com` returned:\n\n")
++  log_file_contents("host-lookup.out")
++  skip_if(true)
++else
++  L("good\n")
++end
+ 
+ mtn_setup()
+ 
============================================================
--- patches/series	21552d38083621973eba28cf85926d9d8dfa72d9
+++ patches/series	0946c8c7d30085fedbd436c8622718ecfab0b444
@@ -4,5 +4,6 @@ 05-hurd-compilation-fix.diff
 03-url_escaping.diff
 04-botan-1.10-adaption.diff
 05-hurd-compilation-fix.diff
+06-broken-dns-work-around.diff
 10-mtn-ignore-syntax-error-test.diff
 90-stacktrace-on-crash.diff