File: 0002-tests-wifi-use-dhcpcd-istead-of-deprecated-ISC-dhcli.patch

package info (click to toggle)
netplan.io 1.1.2-8
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 4,440 kB
  • sloc: python: 34,441; ansic: 13,683; xml: 4,989; javascript: 2,165; sh: 419; makefile: 118
file content (26 lines) | stat: -rw-r--r-- 1,292 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
From: =?utf-8?q?Lukas_M=C3=A4rdian?= <slyon@ubuntu.com>
Date: Tue, 4 Feb 2025 14:58:02 +0100
Subject: tests:wifi: use dhcpcd istead of deprecated ISC dhclient

Origin: https://github.com/canonical/netplan/commit/0b5783e80bad55f0d9005c5f845e3340fb00df5a
Forwarded: not-needed
---
 tests/integration/wifi.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/wifi.py b/tests/integration/wifi.py
index 4e8079a..72efffd 100644
--- a/tests/integration/wifi.py
+++ b/tests/integration/wifi.py
@@ -172,9 +172,9 @@ class TestNetworkManager(IntegrationTestsWifi, _CommonTests):
         # connect the other end
         subprocess.check_call(['ip', 'link', 'set', self.dev_w_ap, 'up'])
         subprocess.check_call(['iw', 'dev', self.dev_w_ap, 'connect', 'fake net'])
-        out = subprocess.check_output(['dhclient', '-1', '-v', self.dev_w_ap],
+        out = subprocess.check_output(['dhcpcd', '-w', '-d', self.dev_w_ap],
                                       stderr=subprocess.STDOUT, text=True)
-        self.assertIn('DHCPACK', out)
+        self.assertIn('acknowledged 10.', out)
         out = subprocess.check_output(['iw', 'dev', self.dev_w_ap, 'info'],
                                       text=True)
         self.assertIn('type managed', out)