1
0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00

Merge pull request #30508 from topimiettinen/fix-flaky-test-address-static

test-network: fix racy test for address_static
This commit is contained in:
Frantisek Sumsal 2023-12-18 14:43:26 +00:00 committed by GitHub
commit 6277e47127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2564,10 +2564,10 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
def test_address_static(self):
copy_network_unit('25-address-static.network', '12-dummy.netdev', copy_dropins=False)
start_networkd()
self.setup_nftset('addr4', 'ipv4_addr')
self.setup_nftset('network4', 'ipv4_addr', 'flags interval;')
self.setup_nftset('ifindex', 'iface_index')
start_networkd()
self.wait_online(['dummy98:routable'])
@ -2623,10 +2623,9 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
ip6_null_74=ip6_null_74,
)
# nft set
# FIXME: re-enable once https://github.com/systemd/systemd/issues/30427 is resolved
#self.check_nftset('addr4', r'10\.10\.1\.1')
#self.check_nftset('network4', r'10\.10\.1\.0/24')
#self.check_nftset('ifindex', 'dummy98')
self.check_nftset('addr4', r'10\.10\.1\.1')
self.check_nftset('network4', r'10\.10\.1\.0/24')
self.check_nftset('ifindex', 'dummy98')
self.teardown_nftset('addr4', 'network4', 'ifindex')