Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests:integration: Adopt for systemd v254 (Closes: #1041310) #381

Merged
merged 1 commit into from
Jul 20, 2023
Merged

tests:integration: Adopt for systemd v254 (Closes: #1041310) #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/integration/ethernets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ def test_link_local_ipv4(self):

# TODO: implement link-local handling in NetworkManager backend and move this test into CommonTests()
def test_link_local_ipv6(self):
self.setup_eth(None)
self.setup_eth('ra-only')
with open(self.config, 'w') as f:
f.write('''network:
renderer: %(r)s
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/scenarios.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
class _CommonTests():

def test_mix_bridge_on_bond(self):
self.setup_eth(None)
self.setup_eth('ra-only')
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'bond0'], stderr=subprocess.DEVNULL)
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'br0'], stderr=subprocess.DEVNULL)
with open(self.config, 'w') as f:
Expand Down Expand Up @@ -65,7 +65,7 @@ def test_mix_bridge_on_bond(self):
self.assertIn(self.dev_e2_client, result)

def test_mix_vlan_on_bridge_on_bond(self):
self.setup_eth(None, False)
self.setup_eth('ra-only')
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'bond0'], stderr=subprocess.DEVNULL)
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'br0'], stderr=subprocess.DEVNULL)
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'br1'], stderr=subprocess.DEVNULL)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/vlans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def test_vlan(self):
subprocess.check_output(['ip', 'route', 'show', 'dev', 'nptesttwo']))

def test_vlan_mac_address(self):
self.setup_eth(None)
self.setup_eth('ra-only')
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'myvlan'], stderr=subprocess.DEVNULL)
with open(self.config, 'w') as f:
f.write('''network:
Expand Down