From 0cf99fe7bb4a384ab0428fb19e458ae29b5a6eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
Date: Tue, 19 Dec 2023 11:03:33 +0000
Subject: [PATCH] ci: prpl-haze, turris-omnia: update tests to latest updates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update tests with expected output after latest updates.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
 .gitlab/tests/cram/prpl-haze/010-network.t    |  3 +-
 .gitlab/tests/cram/turris-omnia/010-network.t |  4 +--
 .gitlab/tests/cram/turris-omnia/020-ubus.t    | 33 -------------------
 3 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/.gitlab/tests/cram/prpl-haze/010-network.t b/.gitlab/tests/cram/prpl-haze/010-network.t
index 002493ce7f..4f980ee68e 100644
--- a/.gitlab/tests/cram/prpl-haze/010-network.t
+++ b/.gitlab/tests/cram/prpl-haze/010-network.t
@@ -21,10 +21,9 @@ Check correct interface setup:
    lan1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc mq master br-lan state DOWN mode DEFAULT group default qlen 1000
    lan2: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc mq master br-lan state DOWN mode DEFAULT group default qlen 1000
    lan3: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq master br-lan state UP mode DEFAULT group default qlen 1000
-   lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN mode DEFAULT group default qlen 1000
+   lo: <LOOPBACK,UP,LOWER_UP> mtu 65535 qdisc noqueue state UNKNOWN mode DEFAULT group default qlen 1000
    miireg: <> mtu 0 qdisc noop state DOWN mode DEFAULT group default qlen 1000
    teql0: <NOARP> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 100
-   veth_gene_0@if3: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master br-lan state UP mode DEFAULT group default qlen 1000
    wan: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc htb state UP mode DEFAULT group default qlen 1000
    wlan0.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-lan state DOWN mode DEFAULT group default qlen 1000
    wlan0.2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 1000
diff --git a/.gitlab/tests/cram/turris-omnia/010-network.t b/.gitlab/tests/cram/turris-omnia/010-network.t
index c55d9c543a..351e2e0801 100644
--- a/.gitlab/tests/cram/turris-omnia/010-network.t
+++ b/.gitlab/tests/cram/turris-omnia/010-network.t
@@ -6,16 +6,17 @@ Check correct routing table:
 
   $ R ip route
   default via 10.0.0.1 dev eth2 
-  default via 10.0.0.1 dev eth2 proto static src 10.0.0.2 
   10.0.0.0/24 dev eth2 proto kernel scope link src 10.0.0.2 
   192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1 
   192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown 
+  192.168.5.0/24 dev br-lcm proto kernel scope link src 192.168.5.1 linkdown 
 
 Check correct interface setup:
 
   $ R "ip link | grep ^\\\\d | cut -d: -f2-" | LC_ALL=C sort
    br-guest: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
    br-lan: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000
+   br-lcm: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
    eth0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1024
    eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1508 qdisc mq state UP mode DEFAULT group default qlen 1024
    eth2: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc htb state UP mode DEFAULT group default qlen 1024
@@ -27,7 +28,6 @@ Check correct interface setup:
    lan4@eth1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue master br-lan state LOWERLAYERDOWN mode DEFAULT group default qlen 1000
    lo: <LOOPBACK,UP,LOWER_UP> mtu 65535 qdisc noqueue state UNKNOWN mode DEFAULT group default qlen 1000
    teql0: <NOARP> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 100
-   veth_gene_0@if3: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master br-lan state UP mode DEFAULT group default qlen 1000
    wlan0.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-lan state DOWN mode DEFAULT group default qlen 1000
    wlan0.2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 1000
    wlan0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DORMANT group default qlen 1000
diff --git a/.gitlab/tests/cram/turris-omnia/020-ubus.t b/.gitlab/tests/cram/turris-omnia/020-ubus.t
index 8a5ee9e02e..fd975d4d75 100644
--- a/.gitlab/tests/cram/turris-omnia/020-ubus.t
+++ b/.gitlab/tests/cram/turris-omnia/020-ubus.t
@@ -2,39 +2,6 @@ Create R alias:
 
   $ alias R="${CRAM_REMOTE_COMMAND:-}"
 
-Check that ubus has all expected services available:
-
-  $ R "ubus list | grep -v '^[[:upper:]]'"
-  container
-  dhcp
-  dnsmasq
-  dnsmasq.dns
-  hostapd
-  hotplug.dhcp
-  hotplug.ieee80211
-  hotplug.iface
-  hotplug.neigh
-  hotplug.net
-  hotplug.ntp
-  hotplug.tftp
-  network
-  network.device
-  network.interface
-  network.interface.guest
-  network.interface.lan
-  network.interface.loopback
-  network.interface.wan
-  network.interface.wan6
-  network.wireless
-  rc
-  service
-  session
-  system
-  uci
-  umdns
-  wpa_supplicant
-  wpa_supplicant.wlan0
-
 Check that we've correct system info:
 
   $ R "ubus call system board | jsonfilter -e @.system -e @.model -e @.board_name"