From: Robert Pluim <rpluim@gmail.com>
Date: Sat, 24 Aug 2019 12:54:02 +0000 (+0200)
Subject: Fix DNS tests
X-Git-Tag: emacs-27.0.90~1328^2~88^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=649fb174431fd030c4bef563af79fe65c5fbf979;p=emacs.git

Fix DNS tests

* test/src/process-tests.el: (lookup-family-specification,
lookup-unicode-domains, unibyte-domain-name, lookup-google,
non-existent-lookup-failure): Skip on Hydra, which doesn't have DNS.
Fix buggy test condition.  (Bug#37165)
---

diff --git a/test/src/process-tests.el b/test/src/process-tests.el
index 724da1c3e72..82eeee1150a 100644
--- a/test/src/process-tests.el
+++ b/test/src/process-tests.el
@@ -323,31 +323,39 @@ See Bug#30460."
                                                   invocation-directory))
                  :stop t)))
 
+;; All the following tests require working DNS, which appears not to
+;; be the case for hydra.nixos.org, so disable them there for now.
+
 (ert-deftest lookup-family-specification ()
   "network-lookup-address-info should only accept valid family symbols."
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
   (should-error (network-lookup-address-info "google.com" 'both))
   (should (network-lookup-address-info "google.com" 'ipv4))
   (should (network-lookup-address-info "google.com" 'ipv6)))
 
 (ert-deftest lookup-unicode-domains ()
   "Unicode domains should fail"
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
   (should-error (network-lookup-address-info "faß.de"))
-  (should (length (network-lookup-address-info (puny-encode-domain "faß.de")))))
+  (should (network-lookup-address-info (puny-encode-domain "faß.de"))))
 
 (ert-deftest unibyte-domain-name ()
   "Unibyte domain names should work"
-  (should (length (network-lookup-address-info (string-to-unibyte "google.com")))))
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
+  (should (network-lookup-address-info (string-to-unibyte "google.com"))))
 
 (ert-deftest lookup-google ()
   "Check that we can look up google IP addresses"
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
   (let ((addresses-both (network-lookup-address-info "google.com"))
         (addresses-v4 (network-lookup-address-info "google.com" 'ipv4))
         (addresses-v6 (network-lookup-address-info "google.com" 'ipv6)))
-    (should (length addresses-both))
-    (should (length addresses-v4))
-    (should (length addresses-v6))))
+    (should addresses-both)
+    (should addresses-v4)
+    (should addresses-v6)))
 
 (ert-deftest non-existent-lookup-failure ()
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
   "Check that looking up non-existent domain returns nil"
   (should (eq nil (network-lookup-address-info "emacs.invalid"))))