maple/prplos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: tests: turris-omnia: 020-bridging-guest: fix test for OpenWrt 22.03

Browse Source 
Seems like the output of brctl has changed in OpenWrt 22.03 in a way,
that the first interface attached to the bridge is random, so we need to
adjust the test cases accordingly.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Petr Štetiar 2022-08-07 08:01:39 +00:00 committed by Petr Štetiar
parent 3dfef1b742
commit 53bbbb30db
No known key found for this signature in database
GPG Key ID: 58EE120F30CC02D3
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.gitlab/tests/cram/turris-omnia/acceleration-plan-components/020-bridging-guest.t
View File

@ -4,14 +4,9 @@ Create R alias:
Get initial state of bridges:
$ R "brctl show | cut -d$'\t' -f1,4-"
bridge name\tSTP enabled\tinterfaces (esc)
br-guest\tno (esc)
br-lan\tno\t\tlan0 (esc)
\t\t\t\t\tlan1 (esc)
\t\t\t\t\tlan2 (esc)
\t\t\t\t\tlan3 (esc)
\t\t\t\t\tlan4 (esc)
$ R "brctl show | grep -E '(br-lan|br-guest)' | sort | cut -d$'\t' -f1,6" | tr '\t' ' '
br-guest
br-lan lan(0|1|2|3|4) (re)
Remove lan4 from LAN bridge and add it to the Guest bridge:
@ -25,13 +20,9 @@ Remove lan4 from LAN bridge and add it to the Guest bridge:
Check that lan4 is added to Guest bridge:
$ R "brctl show | cut -d$'\t' -f1,4-"
bridge name\tSTP enabled\tinterfaces (esc)
br-guest\tno\t\tlan4 (esc)
br-lan\tno\t\tlan0 (esc)
\t\t\t\t\tlan1 (esc)
\t\t\t\t\tlan2 (esc)
\t\t\t\t\tlan3 (esc)
$ R "brctl show | grep -E '(br-lan|br-guest)' | sort | cut -d$'\t' -f1,6" | tr '\t' ' '
br-guest lan4
br-lan lan(0|1|2|3) (re)
Remove lan4 from the Guest bridge and add it back to the LAN bridge:
@ -45,11 +36,6 @@ Remove lan4 from the Guest bridge and add it back to the LAN bridge:
Check for initial state of bridges again:
$ R "brctl show | cut -d$'\t' -f1,4-"
bridge name\tSTP enabled\tinterfaces (esc)
br-guest\tno (esc)
br-lan\tno\t\tlan0 (esc)
\t\t\t\t\tlan1 (esc)
\t\t\t\t\tlan2 (esc)
\t\t\t\t\tlan3 (esc)
\t\t\t\t\tlan4 (esc)
$ R "brctl show | grep -E '(br-lan|br-guest)' | sort | cut -d$'\t' -f1,6" | tr '\t' ' '
br-guest
br-lan lan(0|1|2|3|4) (re)