test:integration: Try to improve test flakyness (Closes: #1069871)

canonical · Jun 25, 2024 · a8705b5 · a8705b5
1 parent b973028
commit a8705b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/tests/integration/base.py b/tests/integration/base.py
@@ -160,11 +160,19 @@ def shutdown_devices(klass):
 
         subprocess.check_call(['ip', 'link', 'del', 'dev', klass.dev_e_ap])
         subprocess.check_call(['ip', 'link', 'del', 'dev', klass.dev_e2_ap])
+        subprocess.call(['ip', 'link', 'del', 'dev', klass.dev_e_client],
+                        stderr=subprocess.PIPE)
+        subprocess.call(['ip', 'link', 'del', 'dev', klass.dev_e2_client],
+                        stderr=subprocess.PIPE)
         klass.dev_e_ap = None
         klass.dev_e_client = None
         klass.dev_e2_ap = None
         klass.dev_e2_client = None
 
+        subprocess.call(['ip', 'link', 'del', 'dev', 'iface1'],
+                        stderr=subprocess.PIPE)
+        subprocess.call(['ip', 'link', 'del', 'dev', 'iface2'],
+                        stderr=subprocess.PIPE)
         subprocess.call(['ip', 'link', 'del', 'dev', 'mybr'],
                         stderr=subprocess.PIPE)
         subprocess.call(['ip', 'link', 'del', 'dev', 'nptestsrv'],

diff --git a/tests/integration/ethernets.py b/tests/integration/ethernets.py
@@ -195,7 +195,7 @@ def test_manual_addresses(self):
                          subprocess.check_output(['ip', '-6', 'route', 'show', 'dev', self.dev_e2_client]))
 
     def test_dhcp6(self):
-        self.setup_eth('slaac')
+        self.setup_eth('')  # empty string, as we want stateful DHCPv6 without SLAAC IP
         with open(self.config, 'w') as f:
             f.write('''network:
   version: 2
@@ -208,7 +208,7 @@ def test_dhcp6(self):
         self.assert_iface_up(self.dev_e_client, ['inet6 2600:'], ['inet 192.168'])
 
     def test_ip6_token(self):
-        self.setup_eth('slaac')
+        self.setup_eth('ra-only')
         with open(self.config, 'w') as f:
             f.write('''network:
   version: 2