bug#42111: tests/syscalls.scm stumbles on network interface aliases

bug#42111: tests/syscalls.scm stumbles on network interface aliases

[Marius Bakke]

[-- 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 --]

bug#42111: tests/syscalls.scm stumbles on network interface aliases

[Ludovic Courtès]

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’.

bug#42111: tests/syscalls.scm stumbles on network interface aliases

[Marius Bakke]

[-- 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 --]