Skip to content

Commit 6270143

Browse files
slyonslyon
committed
tests:base: avoid long waits
1 parent b98a160 commit 6270143

File tree

7 files changed

+11
-35
lines changed

7 files changed

+11
-35
lines changed

‎tests/integration/base.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ def setup_eth(self, ipv6_mode, start_dnsmasq=True):
199199
subprocess.check_call(['ip', 'link', 'set', self.dev_e2_ap, 'up'])
200200
if start_dnsmasq:
201201
self.start_dnsmasq(ipv6_mode, self.dev_e_ap)
202+
self.start_dnsmasq(ipv6_mode, self.dev_e2_ap)
202203

203204
#
204205
# Internal implementation details

‎tests/integration/bonds.py‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ def test_bond_mac(self):
354354
match:
355355
name: %(ec)s
356356
macaddress: %(ec_mac)s
357+
%(e2c)s: {}
357358
bonds:
358359
mybond:
359360
interfaces: [ethbn]
@@ -428,7 +429,6 @@ def test_bond_up_delay(self):
428429

429430
def test_bond_arp_interval(self):
430431
self.setup_eth(None)
431-
self.start_dnsmasq(None, self.dev_e2_ap)
432432
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybond'], stderr=subprocess.DEVNULL)
433433
with open(self.config, 'w') as f:
434434
f.write('''network:
@@ -458,7 +458,6 @@ def test_bond_arp_interval(self):
458458

459459
def test_bond_arp_targets(self):
460460
self.setup_eth(None)
461-
self.start_dnsmasq(None, self.dev_e2_ap)
462461
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybond'], stderr=subprocess.DEVNULL)
463462
with open(self.config, 'w') as f:
464463
f.write('''network:
@@ -488,7 +487,6 @@ def test_bond_arp_targets(self):
488487

489488
def test_bond_arp_targets_many_lp1829264(self):
490489
self.setup_eth(None)
491-
self.start_dnsmasq(None, self.dev_e2_ap)
492490
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybond'], stderr=subprocess.DEVNULL)
493491
with open(self.config, 'w') as f:
494492
f.write('''network:
@@ -520,7 +518,6 @@ def test_bond_arp_targets_many_lp1829264(self):
520518

521519
def test_bond_arp_all_targets(self):
522520
self.setup_eth(None)
523-
self.start_dnsmasq(None, self.dev_e2_ap)
524521
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybond'], stderr=subprocess.DEVNULL)
525522
with open(self.config, 'w') as f:
526523
f.write('''network:
@@ -552,7 +549,6 @@ def test_bond_arp_all_targets(self):
552549

553550
def test_bond_arp_validate(self):
554551
self.setup_eth(None)
555-
self.start_dnsmasq(None, self.dev_e2_ap)
556552
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybond'], stderr=subprocess.DEVNULL)
557553
with open(self.config, 'w') as f:
558554
f.write('''network:
@@ -651,7 +647,6 @@ def test_bond_up_delay(self):
651647

652648
def test_bond_arp_interval(self):
653649
self.setup_eth(None)
654-
self.start_dnsmasq(None, self.dev_e2_ap)
655650
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybond'], stderr=subprocess.DEVNULL)
656651
with open(self.config, 'w') as f:
657652
f.write('''network:
@@ -681,7 +676,6 @@ def test_bond_arp_interval(self):
681676

682677
def test_bond_arp_targets(self):
683678
self.setup_eth(None)
684-
self.start_dnsmasq(None, self.dev_e2_ap)
685679
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybond'], stderr=subprocess.DEVNULL)
686680
with open(self.config, 'w') as f:
687681
f.write('''network:
@@ -711,7 +705,6 @@ def test_bond_arp_targets(self):
711705

712706
def test_bond_arp_all_targets(self):
713707
self.setup_eth(None)
714-
self.start_dnsmasq(None, self.dev_e2_ap)
715708
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybond'], stderr=subprocess.DEVNULL)
716709
with open(self.config, 'w') as f:
717710
f.write('''network:

‎tests/integration/bridges.py‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class _CommonTests():
3232

3333
def test_eth_and_bridge(self):
3434
self.setup_eth(None)
35-
self.start_dnsmasq(None, self.dev_e2_ap)
3635
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
3736
with open(self.config, 'w') as f:
3837
f.write('''network:
@@ -69,7 +68,6 @@ def test_eth_and_bridge(self):
6968
def test_bridge_path_cost(self):
7069
self.setup_eth(None)
7170
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
72-
self.start_dnsmasq(None, self.dev_e2_ap)
7371
with open(self.config, 'w') as f:
7472
f.write('''network:
7573
renderer: %(r)s
@@ -103,7 +101,6 @@ def test_bridge_path_cost(self):
103101
def test_bridge_ageing_time(self):
104102
self.setup_eth(None)
105103
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
106-
self.start_dnsmasq(None, self.dev_e2_ap)
107104
with open(self.config, 'w') as f:
108105
f.write('''network:
109106
renderer: %(r)s
@@ -136,7 +133,6 @@ def test_bridge_ageing_time(self):
136133
def test_bridge_max_age(self):
137134
self.setup_eth(None)
138135
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
139-
self.start_dnsmasq(None, self.dev_e2_ap)
140136
with open(self.config, 'w') as f:
141137
f.write('''network:
142138
renderer: %(r)s
@@ -169,7 +165,6 @@ def test_bridge_max_age(self):
169165
def test_bridge_hello_time(self):
170166
self.setup_eth(None)
171167
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
172-
self.start_dnsmasq(None, self.dev_e2_ap)
173168
with open(self.config, 'w') as f:
174169
f.write('''network:
175170
renderer: %(r)s
@@ -202,7 +197,6 @@ def test_bridge_hello_time(self):
202197
def test_bridge_forward_delay(self):
203198
self.setup_eth(None)
204199
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
205-
self.start_dnsmasq(None, self.dev_e2_ap)
206200
with open(self.config, 'w') as f:
207201
f.write('''network:
208202
renderer: %(r)s
@@ -235,7 +229,6 @@ def test_bridge_forward_delay(self):
235229
def test_bridge_stp_false(self):
236230
self.setup_eth(None)
237231
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
238-
self.start_dnsmasq(None, self.dev_e2_ap)
239232
with open(self.config, 'w') as f:
240233
f.write('''network:
241234
renderer: %(r)s
@@ -275,7 +268,6 @@ class TestNetworkd(IntegrationTestsBase, _CommonTests):
275268
def test_bridge_mac(self):
276269
self.setup_eth(None)
277270
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'br0'], stderr=subprocess.DEVNULL)
278-
self.start_dnsmasq(None, self.dev_e2_ap)
279271
with open(self.config, 'w') as f:
280272
f.write('''network:
281273
renderer: %(r)s
@@ -284,6 +276,7 @@ def test_bridge_mac(self):
284276
match:
285277
name: %(ec)s
286278
macaddress: %(ec_mac)s
279+
%(e2c)s: {}
287280
bridges:
288281
br0:
289282
interfaces: [ethbr]
@@ -301,7 +294,6 @@ def test_bridge_mac(self):
301294
def test_bridge_anonymous(self):
302295
self.setup_eth(None)
303296
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
304-
self.start_dnsmasq(None, self.dev_e2_ap)
305297
with open(self.config, 'w') as f:
306298
f.write('''network:
307299
renderer: %(r)s
@@ -329,7 +321,6 @@ def test_bridge_anonymous(self):
329321
def test_bridge_isolated(self):
330322
self.setup_eth(None)
331323
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
332-
self.start_dnsmasq(None, self.dev_e2_ap)
333324
with open(self.config, 'w') as f:
334325
f.write('''network:
335326
renderer: %(r)s
@@ -349,7 +340,6 @@ def test_bridge_isolated(self):
349340
def test_bridge_port_priority(self):
350341
self.setup_eth(None)
351342
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
352-
self.start_dnsmasq(None, self.dev_e2_ap)
353343
with open(self.config, 'w') as f:
354344
f.write('''network:
355345
renderer: %(r)s
@@ -393,7 +383,6 @@ def test_bridge_mac(self):
393383
def test_bridge_priority(self):
394384
self.setup_eth(None)
395385
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
396-
self.start_dnsmasq(None, self.dev_e2_ap)
397386
with open(self.config, 'w') as f:
398387
f.write('''network:
399388
renderer: %(r)s
@@ -426,7 +415,6 @@ def test_bridge_priority(self):
426415
def test_bridge_port_priority(self):
427416
self.setup_eth(None)
428417
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybr'], stderr=subprocess.DEVNULL)
429-
self.start_dnsmasq(None, self.dev_e2_ap)
430418
with open(self.config, 'w') as f:
431419
f.write('''network:
432420
renderer: %(r)s

‎tests/integration/ethernets.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class _CommonTests():
3232

3333
def test_eth_mtu(self):
3434
self.setup_eth(None)
35-
self.start_dnsmasq(None, self.dev_e2_ap)
3635
with open(self.config, 'w') as f:
3736
f.write('''network:
3837
renderer: %(r)s
@@ -55,7 +54,6 @@ def test_eth_mtu(self):
5554

5655
def test_eth_mac(self):
5756
self.setup_eth(None)
58-
self.start_dnsmasq(None, self.dev_e2_ap)
5957
with open(self.config, 'w') as f:
6058
f.write('''network:
6159
renderer: %(r)s
@@ -81,7 +79,6 @@ def test_eth_glob(self):
8179
8280
Interface globbing was introduced as of NM 1.14+'''
8381
self.setup_eth(None)
84-
self.start_dnsmasq(None, self.dev_e2_ap)
8582
with open(self.config, 'w') as f:
8683
f.write('''network:
8784
renderer: %(r)s
@@ -175,7 +172,6 @@ def test_manual_addresses(self):
175172
addresses: ["172.16.7.2/30", "4321:AAAA::99/80"]
176173
dhcp4: yes
177174
''' % {'r': self.backend, 'ec': self.dev_e_client, 'e2c': self.dev_e2_client})
178-
self.start_dnsmasq(None, self.dev_e2_ap)
179175
self.generate_and_settle()
180176
if self.backend == 'NetworkManager':
181177
self.nm_online_full(self.dev_e2_client)

‎tests/integration/ovs.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,13 @@ def test_cleanup_interfaces(self):
7878
# If we have just OVS interfaces/ports networkd/networkctl will not be
7979
# aware that our network is ready.
8080
%(ec)s: {addresses: [10.10.10.20/24]}
81+
%(e2c)s: {addresses: [10.10.10.30/24]}
8182
openvswitch:
8283
ports:
8384
- [patch0-1, patch1-0]
8485
bridges:
8586
ovs0: {interfaces: [patch0-1]}
86-
ovs1: {interfaces: [patch1-0]}''' % {'ec': self.dev_e_client})
87+
ovs1: {interfaces: [patch1-0]}''' % {'ec': self.dev_e_client, 'e2c': self.dev_e2_client})
8788
self.generate_and_settle()
8889
# Basic verification that the bridges/ports/interfaces are there in OVS
8990
out = subprocess.check_output(['ovs-vsctl', 'show'])
@@ -119,12 +120,13 @@ def test_cleanup_patch_ports(self):
119120
f.write('''network:
120121
ethernets:
121122
%(ec)s: {addresses: [10.10.10.20/24]}
123+
%(e2c)s: {addresses: [10.10.10.30/24]}
122124
openvswitch:
123125
ports: [[patch0-1, patch1-0]]
124126
bonds:
125127
bond0: {interfaces: [patch1-0, %(ec)s]}
126128
bridges:
127-
ovs0: {interfaces: [patch0-1, bond0]}''' % {'ec': self.dev_e_client})
129+
ovs0: {interfaces: [patch0-1, bond0]}''' % {'ec': self.dev_e_client, 'e2c': self.dev_e2_client})
128130
self.generate_and_settle()
129131
# Basic verification that the bridges/ports/interfaces are there in OVS
130132
out = subprocess.check_output(['ovs-vsctl', 'show'])
@@ -137,6 +139,7 @@ def test_cleanup_patch_ports(self):
137139
f.write('''network:
138140
ethernets:
139141
%(ec)s: {addresses: [10.10.10.20/24]}
142+
%(ec)s: {addresses: [10.10.10.30/24]}
140143
openvswitch:
141144
ports: [[patchx, patchy]]
142145
bonds:
@@ -283,7 +286,7 @@ def test_bond_base(self):
283286
self.assert_iface('ovsbr', ['inet 192.170.1.1/24'])
284287

285288
def test_bridge_patch_ports(self):
286-
self.setup_eth(None, False)
289+
self.setup_eth(None)
287290
self.addCleanup(subprocess.call, ['ovs-vsctl', '--if-exists', 'del-br', 'br0'])
288291
self.addCleanup(subprocess.call, ['ovs-vsctl', '--if-exists', 'del-br', 'br1'])
289292
self.addCleanup(subprocess.call, ['ovs-vsctl', '--if-exists', 'del-port', 'patch0-1'])
@@ -374,11 +377,12 @@ def test_vlan_maas(self):
374377
nameservers:
375378
addresses: [10.5.32.99]
376379
search: [maas]
380+
%(e2c)s: {}
377381
vlans:
378382
%(ec)s.21:
379383
id: 21
380384
link: %(ec)s
381-
mtu: 1500''' % {'ec': self.dev_e_client})
385+
mtu: 1500''' % {'ec': self.dev_e_client, 'e2c': self.dev_e2_client})
382386
self.generate_and_settle()
383387
# Basic verification that the interfaces/ports are set up in OVS
384388
out = subprocess.check_output(['ovs-vsctl', 'show'], universal_newlines=True)

‎tests/integration/regressions.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class TestNetworkd(IntegrationTestsBase, _CommonTests):
4242

4343
def test_lp1802322_bond_mac_rename(self):
4444
self.setup_eth(None)
45-
self.start_dnsmasq(None, self.dev_e2_ap)
4645
self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'mybond'], stderr=subprocess.DEVNULL)
4746
with open(self.config, 'w') as f:
4847
f.write('''network:

‎tests/integration/routing.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ def test_route_on_link(self):
3535
The on-link option was introduced as of NM 1.12+ (for IPv4)
3636
The on-link option was introduced as of NM 1.18+ (for IPv6)'''
3737
self.setup_eth(None)
38-
self.start_dnsmasq(None, self.dev_e2_ap)
3938
with open(self.config, 'w') as f:
4039
f.write('''network:
4140
renderer: %(r)s
@@ -59,7 +58,6 @@ def test_route_from(self):
5958
6059
The from option was introduced as of NM 1.8+'''
6160
self.setup_eth(None)
62-
self.start_dnsmasq(None, self.dev_e2_ap)
6361
with open(self.config, 'w') as f:
6462
f.write('''network:
6563
renderer: %(r)s
@@ -82,7 +80,6 @@ def test_route_table(self):
8280
8381
The table option was introduced as of NM 1.10+'''
8482
self.setup_eth(None)
85-
self.start_dnsmasq(None, self.dev_e2_ap)
8683
table_id = '255' # This is the 'local' FIB of /etc/iproute2/rt_tables
8784
with open(self.config, 'w') as f:
8885
f.write('''network:
@@ -263,7 +260,6 @@ def test_link_route_v4(self):
263260
@unittest.skip("networkd does not handle non-unicast routes correctly yet (Invalid argument)")
264261
def test_route_type_blackhole(self):
265262
self.setup_eth(None)
266-
self.start_dnsmasq(None, self.dev_e2_ap)
267263
with open(self.config, 'w') as f:
268264
f.write('''network:
269265
renderer: %(r)s
@@ -283,7 +279,6 @@ def test_route_type_blackhole(self):
283279

284280
def test_route_with_policy(self):
285281
self.setup_eth(None)
286-
self.start_dnsmasq(None, self.dev_e2_ap)
287282
with open(self.config, 'w') as f:
288283
f.write('''network:
289284
renderer: %(r)s

0 commit comments

Comments
 (0)