Wireless Daemon for Linux
 help / color / mirror / Atom feed
From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.01.org
Subject: [PATCH 2/4] auto-t: fix testNetconfig hardcoded interface
Date: Tue, 03 Nov 2020 11:06:39 -0800	[thread overview]
Message-ID: <20201103190641.2736204-2-prestwoj@gmail.com> (raw)
In-Reply-To: <20201103190641.2736204-1-prestwoj@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1646 bytes --]

If running multiple tests testNetconfig would fail due to the
hardcoded wln0 in the dhcpd.conf file. dhcpd can actually start
by passing in the interface to the run command rather than
inside the config file.
---
 autotests/testNetconfig/connection_test.py | 3 ++-
 autotests/testNetconfig/dhcpd.conf         | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/autotests/testNetconfig/connection_test.py b/autotests/testNetconfig/connection_test.py
index 6818ceff..5fc7a88e 100644
--- a/autotests/testNetconfig/connection_test.py
+++ b/autotests/testNetconfig/connection_test.py
@@ -62,7 +62,8 @@ class Test(unittest.TestCase):
         ctx.start_process(['ifconfig', hapd.ifname, '192.168.1.1', 'netmask', '255.255.255.0'],
                                 wait=True)
         ctx.start_process(['touch', '/tmp/dhcpd.leases'], wait=True)
-        ctx.start_process(['dhcpd', '-cf', '/tmp/dhcpd.conf', '-lf', '/tmp/dhcpd.leases'])
+        ctx.start_process(['dhcpd', '-cf', '/tmp/dhcpd.conf', '-lf', '/tmp/dhcpd.leases',
+                            hapd.ifname])
 
     @classmethod
     def tearDownClass(cls):
diff --git a/autotests/testNetconfig/dhcpd.conf b/autotests/testNetconfig/dhcpd.conf
index 77b4da1c..0c4fe9b9 100644
--- a/autotests/testNetconfig/dhcpd.conf
+++ b/autotests/testNetconfig/dhcpd.conf
@@ -10,7 +10,6 @@ subnet 192.168.1.0 netmask 255.255.255.0
   option routers 192.168.1.1;
   option subnet-mask 255.255.255.0;
   option domain-name-servers 192.168.1.1;
-  interface wln0;
   range 192.168.1.10 192.168.1.20;
   range 192.168.1.100 192.168.1.200;
  }
-- 
2.26.2

  reply	other threads:[~2020-11-03 19:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-03 19:06 [PATCH 1/4] ap: make APRanges optional James Prestwood
2020-11-03 19:06 ` James Prestwood [this message]
2020-11-03 19:06 ` [PATCH 3/4] auto-t: remove /var/lib/iwd references in testKnownNetworks James Prestwood
2020-11-03 19:06 ` [PATCH 4/4] auto-t: fix agent path timing issue James Prestwood
2020-11-03 19:59 ` [PATCH 1/4] ap: make APRanges optional Denis Kenzior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201103190641.2736204-2-prestwoj@gmail.com \
    --to=prestwoj@gmail.com \
    --cc=iwd@lists.01.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox