Skip to content

tests/integration: fix ovsdb-server test on OVS 4.0.0+ #613

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

Open
matperin wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −0
Open

tests/integration: fix ovsdb-server test on OVS 4.0.0+ #613

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
9 changes: 9 additions & 0 deletions tests/integration/ovs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,17 @@ def test_missing_ovs_tools(self):
def test_ovsdb_server_is_not_running(self):
self.setup_eth(None, False)
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'br0'], stderr=subprocess.DEVNULL)
# ovsdb-server.socket (added in OVS 4.0.0) must be stopped too, otherwise
# systemd socket activation will restart ovsdb-server.service on the next
# connection attempt (e.g. from ovs-vsctl show), making the database
# reachable again despite the service being stopped. Older OVS releases
# don't ship this unit, so failures here are ignored on purpose to preserve
# current functionality.
self.addCleanup(subprocess.call, ['systemctl', 'start', 'ovsdb-server.socket'],
stderr=subprocess.DEVNULL)
self.addCleanup(subprocess.call, ['systemctl', 'start', 'ovsdb-server.service'])
self.addCleanup(subprocess.call, ['systemctl', 'start', 'ovs-vswitchd.service'])
subprocess.call(['systemctl', 'stop', 'ovsdb-server.socket'], stderr=subprocess.DEVNULL)
subprocess.check_call(['systemctl', 'stop', 'ovsdb-server.service'])
with open(self.config, 'w') as f:
f.write('''network:
Expand Down
Loading