[PR PATCH] NetworkManager: fix tests

[PR PATCH] NetworkManager: fix tests

[paper42]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages NetworkManager-fix-tests
https://github.com/void-linux/void-packages/pull/31091

NetworkManager: fix tests


A patch file from https://github.com/void-linux/void-packages/pull/31091.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-NetworkManager-fix-tests-31091.patch --]
[-- Type: text/x-diff, Size: 1171 bytes --]

From f63f60534ed877bdb8666f5eaa03c9e888076072 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 24 May 2021 17:38:08 +0200
Subject: [PATCH] NetworkManager: fix tests

---
 srcpkgs/NetworkManager/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 213f7a7a4207..c9444e4d23df 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -28,6 +28,7 @@ makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
  $(vopt_if gir 'libgirepository-devel python3-gobject')
  $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
+checkdepends="python3-dbus"
 short_desc="Network Management daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -51,6 +52,10 @@ patch_args=-Np1
 build_options="gir elogind"
 build_options_default="gir elogind"
 
+pre_check() {
+	echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
+}
+
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		# Replace the values from our patch into the system itself

Re: [PR REVIEW] NetworkManager: fix tests

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31091#discussion_r638190220

Comment:
Could you add a comment on top about this being a random or specific value?

Also, I think it would be correct to remove the file in `post_check`.

Re: [PR REVIEW] NetworkManager: fix tests

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31091#discussion_r638190220

Comment:
Could you add a comment above this line about this being a random or specific value?

Also, I think it would be correct to remove the file in `post_check`.

Re: [PR REVIEW] NetworkManager: fix tests

[paper42]

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/31091#discussion_r638196480

Comment:
The value is random, copied from the elogind template. I will add the comment and remove the file.

Re: [PR PATCH] [Updated] NetworkManager: fix tests

[paper42]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages NetworkManager-fix-tests
https://github.com/void-linux/void-packages/pull/31091

NetworkManager: fix tests


A patch file from https://github.com/void-linux/void-packages/pull/31091.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-NetworkManager-fix-tests-31091.patch --]
[-- Type: text/x-diff, Size: 1263 bytes --]

From dac77d888b7d1368fc915e4f8e48489858a65198 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 24 May 2021 17:38:08 +0200
Subject: [PATCH] NetworkManager: fix tests

---
 srcpkgs/NetworkManager/template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 213f7a7a4207..2f159a9f55c4 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -28,6 +28,7 @@ makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
  $(vopt_if gir 'libgirepository-devel python3-gobject')
  $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
+checkdepends="python3-dbus"
 short_desc="Network Management daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -51,6 +52,15 @@ patch_args=-Np1
 build_options="gir elogind"
 build_options_default="gir elogind"
 
+pre_check() {
+	# machine-id is a random, non-zero value
+	echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
+}
+
+post_check() {
+	rm /etc/machine-id
+}
+
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		# Replace the values from our patch into the system itself

Re: [PR PATCH] [Merged]: NetworkManager: fix tests

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

There's a merged pull request on the void-packages repository

NetworkManager: fix tests
https://github.com/void-linux/void-packages/pull/31091

Description: