From 90ac40570280f4f423b55a2d9eea5a44317a66e3 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Thu, 25 Feb 2021 16:39:34 +0100 Subject: [PATCH] Re-enable network-stream-tests.el :nowait t tests After the fix for Bug#46709, these no longer fail in the absence of a working Internet connection * test/lisp/net/network-stream-tests.el (internet-is-working): Remove defvar, it's no longer needed in this file. * test/lisp/net/network-stream-tests.el (connect-to-tls-ipv4-nowait): (connect-to-tls-ipv6-nowait): (open-network-stream-tls-nowait): (open-gnutls-stream-new-api-nowait): (open-gnutls-stream-old-api-nowait): Remove check for internet-is-working. --- test/lisp/net/network-stream-tests.el | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el index cc43992f0f0..1a4cc744f0c 100644 --- a/test/lisp/net/network-stream-tests.el +++ b/test/lisp/net/network-stream-tests.el @@ -32,13 +32,6 @@ ;; it pulls in nsm, which then makes the :nowait t' tests fail unless ;; we disable the nsm, which we do by binding 'network-security-level' -;; Check if the Internet seems to be working. Mainly to pacify -;; Debian's CI system. -(defvar internet-is-working - (progn - (require 'dns) - (dns-query "google.com"))) - (ert-deftest make-local-unix-server () (skip-unless (featurep 'make-network-process '(:family local))) (let* ((file (make-temp-name "/tmp/server-test")) @@ -298,7 +291,6 @@ (ert-deftest connect-to-tls-ipv4-nowait () (skip-unless (executable-find "gnutls-serv")) (skip-unless (gnutls-available-p)) - (skip-unless internet-is-working) (let ((server (make-tls-server 44331)) (times 0) (network-security-level 'low) @@ -342,7 +334,6 @@ (ert-deftest connect-to-tls-ipv6-nowait () (skip-unless (executable-find "gnutls-serv")) (skip-unless (gnutls-available-p)) - (skip-unless internet-is-working) (skip-unless (not (eq system-type 'windows-nt))) (skip-unless (featurep 'make-network-process '(:family ipv6))) (let ((server (make-tls-server 44333)) @@ -427,7 +418,6 @@ (ert-deftest open-network-stream-tls-nowait () (skip-unless (executable-find "gnutls-serv")) (skip-unless (gnutls-available-p)) - (skip-unless internet-is-working) (let ((server (make-tls-server 44335)) (times 0) (network-security-level 'low) @@ -656,7 +646,6 @@ (ert-deftest open-gnutls-stream-new-api-nowait () (skip-unless (executable-find "gnutls-serv")) (skip-unless (gnutls-available-p)) - (skip-unless internet-is-working) (let ((server (make-tls-server 44668)) (times 0) (network-security-level 'low) @@ -695,7 +684,6 @@ (ert-deftest open-gnutls-stream-old-api-nowait () (skip-unless (executable-find "gnutls-serv")) (skip-unless (gnutls-available-p)) - (skip-unless internet-is-working) (let ((server (make-tls-server 44669)) (times 0) (network-security-level 'low) -- 2.39.2