* bug#42111: tests/syscalls.scm stumbles on network interface aliases
@ 2020-06-28 15:52 Marius Bakke
2020-06-28 21:02 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Marius Bakke @ 2020-06-28 15:52 UTC (permalink / raw)
To: 42111
[-- Attachment #1.1: Type: text/plain, Size: 559 bytes --]
Hello,
The "network-interface-names" test from tests/syscalls.scm fails if a
network interface alias is configured.
I.e. this command:
ip addr add 127.0.0.2/8 dev lo label lo:lcat
causes the interface to show up in (network-interface-names), but not
(all-network-interface-names), breaking the test.
I could not find a procfs file that displays network aliases, so ISTM
we either need to add syscalls to check IFLA_IFALIAS, or simply ignore
interfaces with a colon (which seems to be required).
This patch does the latter and makes the test succeed:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: diff --]
[-- Type: text/x-patch, Size: 555 bytes --]
diff --git a/tests/syscalls.scm b/tests/syscalls.scm
index 6acaa0b131..7aa16ce3f4 100644
--- a/tests/syscalls.scm
+++ b/tests/syscalls.scm
@@ -382,7 +382,10 @@
(member "lo" names))))
(test-assert "network-interface-names"
- (match (network-interface-names)
+ (match (filter (lambda (if)
+ ;; Ignore interface aliases.
+ (not (string-contains if ":")))
+ (network-interface-names))
(((? string? names) ..1)
(lset<= string=? names (all-network-interface-names)))))
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#42111: tests/syscalls.scm stumbles on network interface aliases
2020-06-28 15:52 bug#42111: tests/syscalls.scm stumbles on network interface aliases Marius Bakke
@ 2020-06-28 21:02 ` Ludovic Courtès
2020-06-28 21:37 ` Marius Bakke
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2020-06-28 21:02 UTC (permalink / raw)
To: Marius Bakke; +Cc: 42111
Hi!
Marius Bakke <marius@gnu.org> skribis:
> The "network-interface-names" test from tests/syscalls.scm fails if a
> network interface alias is configured.
>
> I.e. this command:
>
> ip addr add 127.0.0.2/8 dev lo label lo:lcat
Woow. 🐈
> diff --git a/tests/syscalls.scm b/tests/syscalls.scm
> index 6acaa0b131..7aa16ce3f4 100644
> --- a/tests/syscalls.scm
> +++ b/tests/syscalls.scm
> @@ -382,7 +382,10 @@
> (member "lo" names))))
>
> (test-assert "network-interface-names"
> - (match (network-interface-names)
> + (match (filter (lambda (if)
> + ;; Ignore interface aliases.
Perhaps add “since they don’t show up in (all-network-interface-names)”.
> + (not (string-contains if ":")))
> + (network-interface-names))
You can use ‘remove’ instead of ‘filter’ + ‘not’.
Otherwise LGTM, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#42111: tests/syscalls.scm stumbles on network interface aliases
2020-06-28 21:02 ` Ludovic Courtès
@ 2020-06-28 21:37 ` Marius Bakke
0 siblings, 0 replies; 3+ messages in thread
From: Marius Bakke @ 2020-06-28 21:37 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 42111-done
[-- Attachment #1: Type: text/plain, Size: 802 bytes --]
Ludovic Courtès <ludo@gnu.org> writes:
>> diff --git a/tests/syscalls.scm b/tests/syscalls.scm
>> index 6acaa0b131..7aa16ce3f4 100644
>> --- a/tests/syscalls.scm
>> +++ b/tests/syscalls.scm
>> @@ -382,7 +382,10 @@
>> (member "lo" names))))
>>
>> (test-assert "network-interface-names"
>> - (match (network-interface-names)
>> + (match (filter (lambda (if)
>> + ;; Ignore interface aliases.
>
> Perhaps add “since they don’t show up in (all-network-interface-names)”.
>
>> + (not (string-contains if ":")))
>> + (network-interface-names))
>
> You can use ‘remove’ instead of ‘filter’ + ‘not’.
ah, much clearer with those suggestions, thanks!
Pushed in 5e113cf4424b2746cbf3633cd2106c62b89e5b49.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-28 21:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-28 15:52 bug#42111: tests/syscalls.scm stumbles on network interface aliases Marius Bakke
2020-06-28 21:02 ` Ludovic Courtès
2020-06-28 21:37 ` Marius Bakke
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).