diff options
| author | Debian netplan Maintainers <team+netplan@tracker.debian.org> | 2021-10-20 13:22:07 +0200 |
|---|---|---|
| committer | Lukas Märdian <luk@slyon.de> | 2021-10-20 13:22:07 +0200 |
| commit | 387ca006fe657a728eba1b39307208b668058fb6 (patch) | |
| tree | 1c75a6d27f95edffd7087a0b2befd52bf36255e8 | |
| parent | 4887fc49981b1a0848874b725eba56efc4ac0cd3 (diff) | |
autopkgtest-fixes
Gbp-Pq: Name autopkgtest-fixes.patch
| -rw-r--r-- | tests/integration/base.py | 11 | ||||
| -rw-r--r-- | tests/integration/ethernets.py | 5 |
2 files changed, 5 insertions, 11 deletions
diff --git a/tests/integration/base.py b/tests/integration/base.py index 5042bf4..93ee722 100644 --- a/tests/integration/base.py +++ b/tests/integration/base.py @@ -75,7 +75,7 @@ class IntegrationTestsBase(unittest.TestCase): os.makedirs('/etc/NetworkManager/conf.d', exist_ok=True) with open('/etc/NetworkManager/conf.d/99-test-ignore.conf', 'w') as f: - f.write('[keyfile]\nunmanaged-devices+=interface-name:eth0,interface-name:en*,interface-name:veth42,interface-name:veth43') + f.write('[keyfile]\nunmanaged-devices+=interface-name:en*,eth0,veth42,veth43,nptestsrv') subprocess.check_call(['netplan', 'apply']) subprocess.call(['/lib/systemd/systemd-networkd-wait-online', '--quiet', '--timeout=30']) @@ -144,12 +144,6 @@ class IntegrationTestsBase(unittest.TestCase): universal_newlines=True) klass.dev_e2_client_mac = out.split()[2] - os.makedirs('/run/NetworkManager/conf.d', exist_ok=True) - - # work around https://launchpad.net/bugs/1615044 - with open('/run/NetworkManager/conf.d/11-globally-managed-devices.conf', 'w') as f: - f.write('[keyfile]\nunmanaged-devices=') - @classmethod def shutdown_devices(klass): '''Remove test devices''' @@ -432,9 +426,10 @@ class IntegrationTestsWifi(IntegrationTestsBase): klass.dev_w_ap = devs[0] klass.dev_w_client = devs[1] + os.makedirs('/run/NetworkManager/conf.d', exist_ok=True) # don't let NM trample over our fake AP with open('/run/NetworkManager/conf.d/test-blacklist.conf', 'w') as f: - f.write('[main]\nplugins=keyfile\n[keyfile]\nunmanaged-devices+=nptestsrv,%s\n' % klass.dev_w_ap) + f.write('[main]\nplugins=keyfile\n[keyfile]\nunmanaged-devices+=%s\n' % klass.dev_w_ap) @classmethod def shutdown_devices(klass): diff --git a/tests/integration/ethernets.py b/tests/integration/ethernets.py index ce016da..865c0d4 100644 --- a/tests/integration/ethernets.py +++ b/tests/integration/ethernets.py @@ -252,9 +252,8 @@ class TestNetworkd(IntegrationTestsBase, _CommonTests): %(ec)s: dhcp6: no accept-ra: yes - addresses: [ '192.168.1.100/24' ] - %(e2c)s: {}''' % {'r': self.backend, 'ec': self.dev_e_client, 'e2c': self.dev_e2_client}) - self.generate_and_settle() + addresses: [ '192.168.1.100/24' ]''' % {'r': self.backend, 'ec': self.dev_e_client}) + self.generate_and_settle([self.dev_e_client]) self.assert_iface_up(self.dev_e_client, ['inet6 2600:'], []) def test_eth_dhcp6_off_no_accept_ra(self): |