From 39d6b2888c9f51b9e9f8334b1a97c9af3cda62a8 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Thu, 26 Oct 2023 17:20:28 +0300 Subject: [PATCH 1/2] tests: Drop broken unit test for extended-nexthop capability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit extended-nexthop capability can't be unset to interface-based peers. Anyway, this is always silently ignored: ``` ✖ [test] peer\capability extended-nexthop ► prepare: initialize bgp test environment ► case 01: set peer-flag [capability extended-nexthop] on [IP-TEST] ► error: execution of command [no neighbor IP-TEST capability extended-nexthop] has failed with code [13] failed ``` Signed-off-by: Donatas Abraitis --- tests/bgpd/test_peer_attr.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/bgpd/test_peer_attr.c b/tests/bgpd/test_peer_attr.c index bc6eba906905..28035885ff12 100644 --- a/tests/bgpd/test_peer_attr.c +++ b/tests/bgpd/test_peer_attr.c @@ -261,13 +261,6 @@ static struct test_peer_attr test_peer_attrs[] = { .u.flag = PEER_FLAG_CAPABILITY_ENHE, .type = PEER_AT_GLOBAL_FLAG, }, - { - .cmd = "capability extended-nexthop", - .u.flag = PEER_FLAG_CAPABILITY_ENHE, - .type = PEER_AT_GLOBAL_FLAG, - .o.invert_peer = true, - .o.use_iface_peer = true, - }, { .cmd = "capability software-version", .u.flag = PEER_FLAG_CAPABILITY_SOFT_VERSION, From dede6261d850c606af61c72540002bb19d99e14c Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Thu, 26 Oct 2023 17:24:42 +0300 Subject: [PATCH 2/2] bgpd: Drop unnecessary unit test for software-version capability It's tested above, and was just copied from extended-nexthop as an example which is broken too. Signed-off-by: Donatas Abraitis --- tests/bgpd/test_peer_attr.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/bgpd/test_peer_attr.c b/tests/bgpd/test_peer_attr.c index 28035885ff12..af0b984ffd08 100644 --- a/tests/bgpd/test_peer_attr.c +++ b/tests/bgpd/test_peer_attr.c @@ -266,13 +266,6 @@ static struct test_peer_attr test_peer_attrs[] = { .u.flag = PEER_FLAG_CAPABILITY_SOFT_VERSION, .type = PEER_AT_GLOBAL_FLAG, }, - { - .cmd = "capability software-version", - .u.flag = PEER_FLAG_CAPABILITY_SOFT_VERSION, - .type = PEER_AT_GLOBAL_FLAG, - .o.invert_peer = true, - .o.use_iface_peer = true, - }, { .cmd = "description", .peer_cmd = "description FRR Peer",