GNU logs - #44491, boring messages

Message sent to bug-guix@HIDDEN:

Subject: bug#44491: Support GUIX_DISABLE_NETWORK_TESTS environment variable
Resent-From: Vagrant Cascadian <vagrant@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Fri, 06 Nov 2020 21:31:01 +0000
Resent-Message-ID: <handler.44491.B.16046982605035 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 44491 <at> debbugs.gnu.org
From: Vagrant Cascadian <vagrant@HIDDEN>
Date: Fri, 06 Nov 2020 13:30:39 -0800
Message-ID: <87k0uy6um8.fsf@yucca>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
Received-SPF: none client-ip=173.255.214.101; envelope-from=vagrant@HIDDEN;
 helo=cascadia.aikidev.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001,
 SPF_NONE=0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=
Content-Type: text/plain

The following patch adds a GUIX_DISABLE_NETWORK_TESTS environment
variable and disables tests that require network access when it is set.

This is needed for packaging GNU Guix in Debian, where packaging policies
prohibit network access during builds, but may not technically block network
access during builds.

If this could be considered for the upcoming 1.2 release, that would be
appreciated, though I can also carry the patches in Debian...


live well,
  vagrant

--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline;
 filename=0001-tests-Support-disabling-network-tests.patch
Content-Transfer-Encoding: quoted-printable

From=2036516e767f68dbc2bd3dc186f956c0b0fd7de9f1 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@HIDDEN>
Date: Thu, 5 Nov 2020 17:35:52 -0800
Subject: [PATCH] tests: Support disabling network tests.

This is needed for packaging GNU Guix in Debian, where packaging policies
prohibit network access during builds, but may not technically block network
access during builds.

* guix/tests.scm (network-reachable): Return #f when
  GUIX_DISABLE_NETWORK_TESTS is set.
* tests/common.sh: New file.
* tests/guix-build-branch.sh, tests/guix-environment.sh,
  tests/guix-pack.sh, tests/guix-package-net.sh: Use
  network_reachable function from common.sh.
=2D--
 guix/tests.scm             | 7 +++++--
 tests/common.sh            | 8 ++++++++
 tests/guix-build-branch.sh | 8 ++------
 tests/guix-environment.sh  | 5 ++---
 tests/guix-pack.sh         | 5 ++---
 tests/guix-package-net.sh  | 9 ++-------
 6 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 tests/common.sh

diff --git a/guix/tests.scm b/guix/tests.scm
index fc3d521163..9f98cef33f 100644
=2D-- a/guix/tests.scm
+++ b/guix/tests.scm
@@ -204,8 +204,11 @@ too expensive to build entirely in the test store."
              (zero? (logand #o222 (stat:mode st)))))))
=20
 (define (network-reachable?)
=2D  "Return true if we can reach the Internet."
=2D  (false-if-exception (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)))
+  "Return true if we can reach the Internet and GUIX_DISABLE_NETWORK_TESTS
+is not set."
+  (if (getenv "GUIX_DISABLE_NETWORK_TESTS")
+      #f
+      (false-if-exception (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV))=
))
=20
 (define-syntax-rule (mock (module proc replacement) body ...)
   "Within BODY, replace the definition of PROC from MODULE with the defini=
tion
diff --git a/tests/common.sh b/tests/common.sh
new file mode 100644
index 0000000000..b91c0bdcd4
=2D-- /dev/null
+++ b/tests/common.sh
@@ -0,0 +1,8 @@
+network_reachable() {
+    if [ -n "$GUIX_DISABLE_NETWORK_TESTS" ]; then
+		exit 77
+    fi
+    if ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /de=
v/null; then
+        exit 77
+    fi
+}
diff --git a/tests/guix-build-branch.sh b/tests/guix-build-branch.sh
index 79aa06a58f..55f8f388ab 100644
=2D-- a/tests/guix-build-branch.sh
+++ b/tests/guix-build-branch.sh
@@ -24,12 +24,8 @@ guix build --version
=20
 # 'guix build --with-branch' requires access to the network to clone the
 # Git repository below.
=2D
=2Dif ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/=
null
=2Dthen
=2D    # Skipping.
=2D    exit 77
=2Dfi
+. $(dirname $0)/common.sh
+network_reachable
=20
 orig_drv=3D"`guix build guile-gcrypt -d`"
 latest_drv=3D"`guix build guile-gcrypt --with-branch=3Dguile-gcrypt=3Dmast=
er -d`"
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh
index f8be48f0c0..d140566aef 100644
=2D-- a/tests/guix-environment.sh
+++ b/tests/guix-environment.sh
@@ -174,9 +174,9 @@ case "$transformed_drv" in
     *)           false;;
 esac
=20
+. $(dirname $0)/common.sh
+network_reachable
=20
=2Dif guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/nu=
ll
=2Dthen
     # Compute the build environment for the initial GNU Make.
     guix environment --bootstrap --no-substitutes --search-paths --pure \
          -e '(@ (guix tests) gnu-make-for-tests)' > "$tmpdir/a"
@@ -244,4 +244,3 @@ then
     do
 	guix gc --references "$profile" | grep "$dep"
     done
=2Dfi
diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh
index 0339221ac2..bc902c7e90 100644
=2D-- a/tests/guix-pack.sh
+++ b/tests/guix-pack.sh
@@ -23,9 +23,8 @@
=20
 # A network connection is required to build %bootstrap-coreutils&co,
 # which is required to run these tests with the --bootstrap option.
=2Dif ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/=
null; then
=2D    exit 77
=2Dfi
+. $(dirname $0)/common.sh
+network_reachable
=20
 guix pack --version
=20
diff --git a/tests/guix-package-net.sh b/tests/guix-package-net.sh
index 6d21c6cff6..ec7952f63d 100644
=2D-- a/tests/guix-package-net.sh
+++ b/tests/guix-package-net.sh
@@ -38,13 +38,8 @@ shebang_too_long ()
 	 -ge 128
 }
=20
=2Dif ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/=
null \
=2D	|| shebang_too_long
=2Dthen
=2D    # Skipping.
=2D    exit 77
=2Dfi
=2D
+. $(dirname $0)/common.sh
+network_reachable
=20
 profile=3D"t-profile-$$"
 profile_alt=3D"t-profile-alt-$$"
=2D-=20
2.20.1


--=-=-=--

--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCX6XAfwAKCRDcUY/If5cW
qqS3AP9xHOh0mV9gisiPEKxYc5qbg2qRZnOq7F3sNFD5WqYe2QEA/RQPsPQGm7cH
a9ldBpc0KYxfLfybPxyBtWIy2x34ng4=
=KzMF
-----END PGP SIGNATURE-----
--==-=-=--

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Vagrant Cascadian <vagrant@HIDDEN>
Subject: bug#44491: Acknowledgement (Support GUIX_DISABLE_NETWORK_TESTS
 environment variable)
Message-ID: <handler.44491.B.16046982605035.ack <at> debbugs.gnu.org>
References: <87k0uy6um8.fsf@yucca>
X-Gnu-PR-Message: ack 44491
X-Gnu-PR-Package: guix
Reply-To: 44491 <at> debbugs.gnu.org
Date: Fri, 06 Nov 2020 21:31:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 bug-guix@HIDDEN

If you wish to submit further information on this problem, please
send it to 44491 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
44491: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D44491
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to bug-guix@HIDDEN:

Subject: bug#44491: Support GUIX_DISABLE_NETWORK_TESTS environment variable
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Sun, 08 Nov 2020 17:47:02 +0000
Resent-Message-ID: <handler.44491.B44491.160485757712243 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Vagrant Cascadian <vagrant@HIDDEN>
Cc: 44491 <at> debbugs.gnu.org
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
References: <87k0uy6um8.fsf@yucca>
Date: Sun, 08 Nov 2020 18:46:06 +0100
In-Reply-To: <87k0uy6um8.fsf@yucca> (Vagrant Cascadian's message of "Fri, 06
 Nov 2020 13:30:39 -0800")
Message-ID: <87y2jbu4gx.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

Hi Vagrant,

Vagrant Cascadian <vagrant@HIDDEN> skribis:

> If this could be considered for the upcoming 1.2 release, that would be
> appreciated, though I can also carry the patches in Debian...

Yay!  It should be doable, let=E2=80=99s see.

> From 36516e767f68dbc2bd3dc186f956c0b0fd7de9f1 Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian <vagrant@HIDDEN>
> Date: Thu, 5 Nov 2020 17:35:52 -0800
> Subject: [PATCH] tests: Support disabling network tests.
>
> This is needed for packaging GNU Guix in Debian, where packaging policies
> prohibit network access during builds, but may not technically block netw=
ork
> access during builds.
>
> * guix/tests.scm (network-reachable): Return #f when
>   GUIX_DISABLE_NETWORK_TESTS is set.
> * tests/common.sh: New file.
> * tests/guix-build-branch.sh, tests/guix-environment.sh,
>   tests/guix-pack.sh, tests/guix-package-net.sh: Use
>   network_reachable function from common.sh.

[...]

> --- /dev/null
> +++ b/tests/common.sh
> @@ -0,0 +1,8 @@
> +network_reachable() {
> +    if [ -n "$GUIX_DISABLE_NETWORK_TESTS" ]; then
> +		exit 77
> +    fi
> +    if ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /=
dev/null; then
> +        exit 77
> +    fi
> +}

Could you add the usual copyright/license header?  Also please add this
file to =E2=80=98EXTRA_DIST=E2=80=99 in Makefile.am.

Looking at the tests you modified, we need two things:

  =E2=80=A2 a =E2=80=98network_reachable=E2=80=99 function that returns tru=
e or false, without
    exiting;

  =E2=80=A2 a =E2=80=98skip_if_network_is_unreachable=E2=80=99 function tha=
t does =E2=80=9Cexit 77=E2=80=9D when
    network is =E2=80=9Cunreachable=E2=80=9D.

> --- a/tests/guix-environment.sh
> +++ b/tests/guix-environment.sh
> @@ -174,9 +174,9 @@ case "$transformed_drv" in
>      *)           false;;
>  esac
>=20=20
> +. $(dirname $0)/common.sh
> +network_reachable
>=20=20
> -if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/nu=
ll
> -then
>      # Compute the build environment for the initial GNU Make.
>      guix environment --bootstrap --no-substitutes --search-paths --pure \

I think this is the only place where you=E2=80=99d write =E2=80=9Cif networ=
k_reachable=E2=80=9D
instead of =E2=80=9Cskip_if_network_is_unreachable=E2=80=9D.

WDYT?

Thanks!

Ludo=E2=80=99.

Message sent to bug-guix@HIDDEN:

Subject: bug#44491: Support GUIX_DISABLE_NETWORK_TESTS environment variable
Resent-From: Vagrant Cascadian <vagrant@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Tue, 10 Nov 2020 18:15:01 +0000
Resent-Message-ID: <handler.44491.B44491.16050320586209 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Cc: 44491 <at> debbugs.gnu.org
From: Vagrant Cascadian <vagrant@HIDDEN>
In-Reply-To: <87y2jbu4gx.fsf@HIDDEN>
References: <87k0uy6um8.fsf@yucca> <87y2jbu4gx.fsf@HIDDEN>
Date: Tue, 10 Nov 2020 10:13:42 -0800
Message-ID: <87k0utt6zt.fsf@yucca>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

On 2020-11-08, Ludovic Court=C3=A8s wrote:
> Vagrant Cascadian <vagrant@HIDDEN> skribis:
>
>> If this could be considered for the upcoming 1.2 release, that would be
>> appreciated, though I can also carry the patches in Debian...
>
> Yay!  It should be doable, let=E2=80=99s see.

It seems like a simpler workaround is to pass RES_OPTIONS=3Dattempts:0,
which should disable name resolution, and thus the network checks will
fail.

With the RES_OPTIONS workaround, the changes to guix/tests.scm
network-reachable are no longer needed ... i think. :)

Might still be worth refactoring some of *.sh tests to use common
functions, since the code is basically copied and pasted in several
different places.

I suspect there are some additional tests that should check for network,
but that is probably a separate bug once they have been identified.


live well,
  vagrant

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCX6rYVgAKCRDcUY/If5cW
quycAQD6UuKDgKtm4wBsFU63niFLvJI3P2VBiJFToVyCLY5DIQD/azB20tPAVsPc
+1a6Jou0jZ4hfsS5qvdbC47uiqhmZgs=
=m3YS
-----END PGP SIGNATURE-----
--=-=-=--

Message sent to bug-guix@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#44491: Support GUIX_DISABLE_NETWORK_TESTS environment variable
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Tue, 10 Nov 2020 21:28:01 +0000
Resent-Message-ID: <handler.44491.B44491.160504362225570 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 44491
X-GNU-PR-Package: guix
X-GNU-PR-Keywords: 
To: Vagrant Cascadian <vagrant@HIDDEN>
Cc: 44491 <at> debbugs.gnu.org
Received: via spool by 44491-submit <at> debbugs.gnu.org id=B44491.160504362225570
          (code B ref 44491); Tue, 10 Nov 2020 21:28:01 +0000
Received: (at 44491) by debbugs.gnu.org; 10 Nov 2020 21:27:02 +0000
Received: from localhost ([127.0.0.1]:39186 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kcbAL-0006eM-Vc
	for submit <at> debbugs.gnu.org; Tue, 10 Nov 2020 16:27:02 -0500
Received: from eggs.gnu.org ([209.51.188.92]:54430)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1kcbAK-0006dr-CX
 for 44491 <at> debbugs.gnu.org; Tue, 10 Nov 2020 16:27:00 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e]:41798)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <ludo@HIDDEN>)
 id 1kcbAE-0007P5-Rb; Tue, 10 Nov 2020 16:26:54 -0500
Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=46972 helo=ribbon)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
 (Exim 4.82) (envelope-from <ludo@HIDDEN>)
 id 1kcbAC-0000X2-9H; Tue, 10 Nov 2020 16:26:53 -0500
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
References: <87k0uy6um8.fsf@yucca> <87y2jbu4gx.fsf@HIDDEN>
 <87k0utt6zt.fsf@yucca>
X-URL: http://www.fdn.fr/~lcourtes/
X-Revolutionary-Date: 20 Brumaire an 229 de la =?UTF-8?Q?R=C3=A9volution?=
X-PGP-Key-ID: 0x090B11993D9AEBB5
X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc
X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4  0CFB 090B 1199 3D9A EBB5
X-OS: x86_64-pc-linux-gnu
Date: Tue, 10 Nov 2020 22:26:49 +0100
In-Reply-To: <87k0utt6zt.fsf@yucca> (Vagrant Cascadian's message of "Tue, 10
 Nov 2020 10:13:42 -0800")
Message-ID: <87wnysnbs6.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Vagrant Cascadian <vagrant@HIDDEN> skribis:

> On 2020-11-08, Ludovic Court=C3=A8s wrote:
>> Vagrant Cascadian <vagrant@HIDDEN> skribis:
>>
>>> If this could be considered for the upcoming 1.2 release, that would be
>>> appreciated, though I can also carry the patches in Debian...
>>
>> Yay!  It should be doable, let=E2=80=99s see.
>
> It seems like a simpler workaround is to pass RES_OPTIONS=3Dattempts:0,
> which should disable name resolution, and thus the network checks will
> fail.
>
> With the RES_OPTIONS workaround, the changes to guix/tests.scm
> network-reachable are no longer needed ... i think. :)

Oooh nice, the wonders of glibc!

> Might still be worth refactoring some of *.sh tests to use common
> functions, since the code is basically copied and pasted in several
> different places.

Yes, that=E2=80=99s still a good idea.  Would you like to adjust your patch
accordingly?

> I suspect there are some additional tests that should check for network,
> but that is probably a separate bug once they have been identified.

OK!

Thanks,
Ludo=E2=80=99.

Message sent to bug-guix@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#44491: Support GUIX_DISABLE_NETWORK_TESTS environment variable
Resent-From: Vagrant Cascadian <vagrant@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Wed, 11 Nov 2020 03:40:01 +0000
Resent-Message-ID: <handler.44491.B44491.16050659874226 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 44491
X-GNU-PR-Package: guix
X-GNU-PR-Keywords: 
To: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Cc: 44491 <at> debbugs.gnu.org
Received: via spool by 44491-submit <at> debbugs.gnu.org id=B44491.16050659874226
          (code B ref 44491); Wed, 11 Nov 2020 03:40:01 +0000
Received: (at 44491) by debbugs.gnu.org; 11 Nov 2020 03:39:47 +0000
Received: from localhost ([127.0.0.1]:39708 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kcgyw-00015w-Rr
	for submit <at> debbugs.gnu.org; Tue, 10 Nov 2020 22:39:47 -0500
Received: from cascadia.aikidev.net ([173.255.214.101]:40780)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vagrant@HIDDEN>) id 1kcgyu-00015h-QC
 for 44491 <at> debbugs.gnu.org; Tue, 10 Nov 2020 22:39:37 -0500
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100b])
 (Authenticated sender: vagrant@HIDDEN)
 by cascadia.aikidev.net (Postfix) with ESMTPSA id 6459E1AA41;
 Tue, 10 Nov 2020 19:39:30 -0800 (PST)
From: Vagrant Cascadian <vagrant@HIDDEN>
In-Reply-To: <87wnysnbs6.fsf@HIDDEN>
References: <87k0uy6um8.fsf@yucca> <87y2jbu4gx.fsf@HIDDEN>
 <87k0utt6zt.fsf@yucca> <87wnysnbs6.fsf@HIDDEN>
Date: Tue, 10 Nov 2020 19:39:25 -0800
Message-ID: <87h7pwtvde.fsf@yucca>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

On 2020-11-10, Ludovic Court=C3=A8s wrote:
> Vagrant Cascadian <vagrant@HIDDEN> skribis:
>> On 2020-11-08, Ludovic Court=C3=A8s wrote:
>>> Vagrant Cascadian <vagrant@HIDDEN> skribis:
>>>
>>>> If this could be considered for the upcoming 1.2 release, that would be
>>>> appreciated, though I can also carry the patches in Debian...
>>>
>>> Yay!  It should be doable, let=E2=80=99s see.
>>
>> It seems like a simpler workaround is to pass RES_OPTIONS=3Dattempts:0,
>> which should disable name resolution, and thus the network checks will
>> fail.
>>
>> With the RES_OPTIONS workaround, the changes to guix/tests.scm
>> network-reachable are no longer needed ... i think. :)
>
> Oooh nice, the wonders of glibc!
>
>> Might still be worth refactoring some of *.sh tests to use common
>> functions, since the code is basically copied and pasted in several
>> different places.
>
> Yes, that=E2=80=99s still a good idea.  Would you like to adjust your pat=
ch
> accordingly?

Thanks for the review!

Updated patch attached, with changes:

* Copyright header added to common.sh.
* New function skip_if_network_unreachable in common.sh
* Dropped GUIX_DISABLE_NETWORK_TESTS in favor of using
  RES_OPTIONS=3Dattempts:0.
* Updated tests to use skip_if_network_unreachable or network_reachable.


live well,
  vagrant


--=-=-=
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: inline;
 filename=0001-tests-Add-common-functions-for-to-check-for-network-.patch
Content-Transfer-Encoding: quoted-printable

From=203fd93fec957491450639c647e05a5f72f1e787fd Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@HIDDEN>
Date: Tue, 10 Nov 2020 19:26:04 -0800
Subject: [PATCH] tests: Add common functions for to check for network
 reachability.

* tests/common.sh: New file.
* tests/guix-build-branch.sh, tests/guix-pack.sh,
  tests/guix-package-net.sh: Use skip_if_network_unreachable function
  from common.sh.
* tests/guix-environment.sh: Use network_reachable function from
  common.sh.
=2D--
 Makefile.am                |  1 +
 tests/common.sh            | 30 ++++++++++++++++++++++++++++++
 tests/guix-build-branch.sh |  8 ++------
 tests/guix-environment.sh  |  5 ++---
 tests/guix-pack.sh         |  5 ++---
 tests/guix-package-net.sh  |  9 ++-------
 6 files changed, 39 insertions(+), 19 deletions(-)
 create mode 100644 tests/common.sh

diff --git a/Makefile.am b/Makefile.am
index e7053ee4f4..7dbe41201c 100644
=2D-- a/Makefile.am
+++ b/Makefile.am
@@ -599,6 +599,7 @@ EXTRA_DIST +=3D						\
   tests/test.drv					\
   tests/signing-key.pub					\
   tests/signing-key.sec					\
+  tests/common.sh					\
   tests/cve-sample.json					\
   tests/civodul.key					\
   tests/rsa.key						\
diff --git a/tests/common.sh b/tests/common.sh
new file mode 100644
index 0000000000..f9dd3c2c59
=2D-- /dev/null
+++ b/tests/common.sh
@@ -0,0 +1,30 @@
+# GNU Guix --- Functional package management for GNU
+# Copyright =C2=A9 2018, 2019, 2020 Ludovic Court=C3=A8s <ludo@HIDDEN>
+# Copyright =C2=A9 2020 Vagrant Cascadian <vagrant@HIDDEN>
+#
+# This file is part of GNU Guix.
+#
+# GNU Guix is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Guix is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+network_reachable() {
+    if ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /de=
v/null; then
+        return 0
+    fi
+}
+
+skip_if_network_unreachable() {
+	if ! network_reachable ; then
+		exit 77
+	fi
+}
diff --git a/tests/guix-build-branch.sh b/tests/guix-build-branch.sh
index 79aa06a58f..89f7ea4a08 100644
=2D-- a/tests/guix-build-branch.sh
+++ b/tests/guix-build-branch.sh
@@ -24,12 +24,8 @@ guix build --version
=20
 # 'guix build --with-branch' requires access to the network to clone the
 # Git repository below.
=2D
=2Dif ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/=
null
=2Dthen
=2D    # Skipping.
=2D    exit 77
=2Dfi
+. $(dirname $0)/common.sh
+skip_if_network_unreachable
=20
 orig_drv=3D"`guix build guile-gcrypt -d`"
 latest_drv=3D"`guix build guile-gcrypt --with-branch=3Dguile-gcrypt=3Dmast=
er -d`"
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh
index f8be48f0c0..ce01ac04be 100644
=2D-- a/tests/guix-environment.sh
+++ b/tests/guix-environment.sh
@@ -174,9 +174,8 @@ case "$transformed_drv" in
     *)           false;;
 esac
=20
=2D
=2Dif guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/nu=
ll
=2Dthen
+. $(dirname $0)/common.sh
+if network_reachable ; then
     # Compute the build environment for the initial GNU Make.
     guix environment --bootstrap --no-substitutes --search-paths --pure \
          -e '(@ (guix tests) gnu-make-for-tests)' > "$tmpdir/a"
diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh
index 0339221ac2..822a67b157 100644
=2D-- a/tests/guix-pack.sh
+++ b/tests/guix-pack.sh
@@ -23,9 +23,8 @@
=20
 # A network connection is required to build %bootstrap-coreutils&co,
 # which is required to run these tests with the --bootstrap option.
=2Dif ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/=
null; then
=2D    exit 77
=2Dfi
+. $(dirname $0)/common.sh
+skip_if_network_unreachable
=20
 guix pack --version
=20
diff --git a/tests/guix-package-net.sh b/tests/guix-package-net.sh
index 6d21c6cff6..f682d09245 100644
=2D-- a/tests/guix-package-net.sh
+++ b/tests/guix-package-net.sh
@@ -38,13 +38,8 @@ shebang_too_long ()
 	 -ge 128
 }
=20
=2Dif ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/=
null \
=2D	|| shebang_too_long
=2Dthen
=2D    # Skipping.
=2D    exit 77
=2Dfi
=2D
+. $(dirname $0)/common.sh
+skip_if_network_unreachable
=20
 profile=3D"t-profile-$$"
 profile_alt=3D"t-profile-alt-$$"
=2D-=20
2.20.1


--=-=-=--

--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCX6tc7QAKCRDcUY/If5cW
qjXoAP9UwrTCnDK4W+RXRtHS95MhDkaSZFebR/N/Rs1DXzM+pQEA8H53YfNavNQv
KQt2jiawV5ROLVdUhuXVJGUfjEgphAI=
=lrkr
-----END PGP SIGNATURE-----
--==-=-=--

Message sent to bug-guix@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#44491: Support GUIX_DISABLE_NETWORK_TESTS environment variable
Resent-From: Vagrant Cascadian <vagrant@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Wed, 11 Nov 2020 06:07:01 +0000
Resent-Message-ID: <handler.44491.B44491.160507481226605 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 44491
X-GNU-PR-Package: guix
X-GNU-PR-Keywords: 
To: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Cc: 44491 <at> debbugs.gnu.org
Received: via spool by 44491-submit <at> debbugs.gnu.org id=B44491.160507481226605
          (code B ref 44491); Wed, 11 Nov 2020 06:07:01 +0000
Received: (at 44491) by debbugs.gnu.org; 11 Nov 2020 06:06:52 +0000
Received: from localhost ([127.0.0.1]:40074 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kcjHQ-0006v3-17
	for submit <at> debbugs.gnu.org; Wed, 11 Nov 2020 01:06:52 -0500
Received: from cascadia.aikidev.net ([173.255.214.101]:40944)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vagrant@HIDDEN>) id 1kcjHO-0006ur-R7
 for 44491 <at> debbugs.gnu.org; Wed, 11 Nov 2020 01:06:51 -0500
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100b])
 (Authenticated sender: vagrant@HIDDEN)
 by cascadia.aikidev.net (Postfix) with ESMTPSA id AD6301AA41;
 Tue, 10 Nov 2020 22:06:44 -0800 (PST)
From: Vagrant Cascadian <vagrant@HIDDEN>
In-Reply-To: <87h7pwtvde.fsf@yucca>
References: <87k0uy6um8.fsf@yucca> <87y2jbu4gx.fsf@HIDDEN>
 <87k0utt6zt.fsf@yucca> <87wnysnbs6.fsf@HIDDEN> <87h7pwtvde.fsf@yucca>
Date: Tue, 10 Nov 2020 22:06:38 -0800
Message-ID: <87eel0tok1.fsf@yucca>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

On 2020-11-10, Vagrant Cascadian wrote:
> On 2020-11-10, Ludovic Court=C3=A8s wrote:
>> Vagrant Cascadian <vagrant@HIDDEN> skribis:
>>> On 2020-11-08, Ludovic Court=C3=A8s wrote:
>>>> Vagrant Cascadian <vagrant@HIDDEN> skribis:
>>>>
>>>>> If this could be considered for the upcoming 1.2 release, that would =
be
>>>>> appreciated, though I can also carry the patches in Debian...
>>>>
>>>> Yay!  It should be doable, let=E2=80=99s see.
>>>
>>> It seems like a simpler workaround is to pass RES_OPTIONS=3Dattempts:0,
>>> which should disable name resolution, and thus the network checks will
>>> fail.
>>>
>>> With the RES_OPTIONS workaround, the changes to guix/tests.scm
>>> network-reachable are no longer needed ... i think. :)
>>
>> Oooh nice, the wonders of glibc!
>>
>>> Might still be worth refactoring some of *.sh tests to use common
>>> functions, since the code is basically copied and pasted in several
>>> different places.
>>
>> Yes, that=E2=80=99s still a good idea.  Would you like to adjust your pa=
tch
>> accordingly?
>
> Thanks for the review!
>
> Updated patch attached, with changes:
>
> * Copyright header added to common.sh.
> * New function skip_if_network_unreachable in common.sh
> * Dropped GUIX_DISABLE_NETWORK_TESTS in favor of using
>   RES_OPTIONS=3Dattempts:0.
> * Updated tests to use skip_if_network_unreachable or network_reachable.

...

> diff --git a/tests/common.sh b/tests/common.sh
> new file mode 100644
> index 0000000000..f9dd3c2c59
> --- /dev/null
> +++ b/tests/common.sh
...
> +network_reachable() {
> +    if ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /=
dev/null; then
> +        return 0
> +    fi
> +}

Ooops. I inverted that check... probably "if guile -c ..." and probably
should return 1 or something if it isn't... or maybe 77?


anyways... testing again.


live well,
  vagrant

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCX6t/bgAKCRDcUY/If5cW
qsDDAQC9MpLOI2Du+kqODXDNDMIOK6TXnr6b60ZHW1pfYf01dgD+Kn79V3s1Eneh
9G9UkbXkrqSv6pz/hZR/JDoY27CGQw4=
=fcUP
-----END PGP SIGNATURE-----
--=-=-=--

Message sent to bug-guix@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#44491: Support GUIX_DISABLE_NETWORK_TESTS environment variable
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Thu, 03 Dec 2020 17:10:01 +0000
Resent-Message-ID: <handler.44491.B44491.160701537219674 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 44491
X-GNU-PR-Package: guix
X-GNU-PR-Keywords: 
To: Vagrant Cascadian <vagrant@HIDDEN>
Cc: 44491 <at> debbugs.gnu.org
Received: via spool by 44491-submit <at> debbugs.gnu.org id=B44491.160701537219674
          (code B ref 44491); Thu, 03 Dec 2020 17:10:01 +0000
Received: (at 44491) by debbugs.gnu.org; 3 Dec 2020 17:09:32 +0000
Received: from localhost ([127.0.0.1]:41622 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kks6m-00057G-IC
	for submit <at> debbugs.gnu.org; Thu, 03 Dec 2020 12:09:32 -0500
Received: from eggs.gnu.org ([209.51.188.92]:33296)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1kks6l-000573-Dg
 for 44491 <at> debbugs.gnu.org; Thu, 03 Dec 2020 12:09:31 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e]:47309)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <ludo@HIDDEN>)
 id 1kks6f-00070u-NJ; Thu, 03 Dec 2020 12:09:25 -0500
Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51466 helo=ribbon)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
 (Exim 4.82) (envelope-from <ludo@HIDDEN>)
 id 1kks6f-00010Y-7u; Thu, 03 Dec 2020 12:09:25 -0500
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
References: <87k0uy6um8.fsf@yucca> <87y2jbu4gx.fsf@HIDDEN>
 <87k0utt6zt.fsf@yucca> <87wnysnbs6.fsf@HIDDEN> <87h7pwtvde.fsf@yucca>
 <87eel0tok1.fsf@yucca>
Date: Thu, 03 Dec 2020 18:09:24 +0100
In-Reply-To: <87eel0tok1.fsf@yucca> (Vagrant Cascadian's message of "Tue, 10
 Nov 2020 22:06:38 -0800")
Message-ID: <87sg8mbyuz.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hi Vagrant,

Should we close this issue now that you found the RES_OPTIONS=3Dattempts:0
trick, or do you think we should still keep the refactoring bits?

Ludo=E2=80=99.

Last modified: Thu, 3 Dec 2020 17:15:01 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.