From patchwork Mon Nov 13 14:32:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13454052 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8AD021116 for ; Mon, 13 Nov 2023 14:32:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MnTRiIYo" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1ce28faa92dso7042075ad.2 for ; Mon, 13 Nov 2023 06:32:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699885979; x=1700490779; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HshdV+YMSfhFmt4mGbkArqJLs+jj3+o35weYH0uag8k=; b=MnTRiIYoy+IB2a/284nWVa8vWCj4KT9qi2/CzMVX8Xp99aY28MmYN/q5/zpuVe6DxV 4IDhtk0tpdtNIGnBgzCeh0sAhaXNkwb/ctdZzlPEQ1Hyb0sB9UMMK1AbrOhZiY3t5nbp Dm7asr46h+j7mLo2GcHQnsKT7+S78sQnMR1zLDsKWFWTMdG2C4jpvzRPXykpxg3nkToH Ud+OrXMBH2A7Axhy+q75DA6hj1QQSL5KCO8hzJCj7gXmnORJZtWFtzT9WfpR+n8ecOD8 pILtaj1T4n9j9gVBBX0K6dR8zcLy1earvPMx8/17W8+S/pcfCbSQVeohNEJ+8yC9uz2U N9ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699885979; x=1700490779; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HshdV+YMSfhFmt4mGbkArqJLs+jj3+o35weYH0uag8k=; b=Hw/5X8RB02ovFm24QsJCWXFAfKo+IwsjBJzbjKNr23FzoFp3yCwN7joWKXIvMzuFNA veqDPkNv8+L5mipycPWJeu1hbnnw0PQ8B6uLQWHpRJt4m8NFxlIQHEgK+nueIWgFxen0 kHsjAYOmWxG5piXCTpkOIrXblzNlAFJrdPHpj9jBPONZyPOA+/l5VCmlmTs+ZmJQQIAw 67ud8fb/9413NCe5+olb4W9F+eh4ZpwiowbZ5Chpk3Cl6aPuGKwqj0sPU0JYWW8qInHm s8md/g6BqZfVVZtijjjWF4vgeoA6jZrjMxkUBGarYLxWOZokxVcan0HfACIMNIvYf7gZ QrnQ== X-Gm-Message-State: AOJu0YwsG0mrqKh0W2GhXN18XWYia+9x4ijOHMjSLB8n6Nc0rUSlbhMi 1tvomFZUz30I/1hX2e662ZpGiaXAUZM= X-Google-Smtp-Source: AGHT+IFRP6d9FdCnXJJRPpRnBt2hon3IW9JEMDCeUGs4Wde+Y6NDYJJkzklv4iteLT4DVQyPS+mKOA== X-Received: by 2002:a17:902:7407:b0:1c5:d8a3:8789 with SMTP id g7-20020a170902740700b001c5d8a38789mr5077055pll.4.1699885978838; Mon, 13 Nov 2023 06:32:58 -0800 (PST) Received: from localhost.localdomain ([50.39.172.77]) by smtp.gmail.com with ESMTPSA id b7-20020a170902d50700b001cc25cfec58sm4071496plg.226.2023.11.13.06.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 06:32:58 -0800 (PST) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 1/3] auto-t: make test timeout configurable Date: Mon, 13 Nov 2023 06:32:53 -0800 Message-Id: <20231113143255.278191-1-prestwoj@gmail.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 With the addition of DPP PKEX autotests some of the timeouts are quite long and hit test-runners maximum timeouts. For UML we should allow this since time-travel lets us skip idle waits. Move the test timeout out of a global define and into the argument list so QEMU and UML can define it differently. --- tools/run-tests | 12 +++++------- tools/runner.py | 7 +++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/run-tests b/tools/run-tests index 32c09723..11ad73c0 100755 --- a/tools/run-tests +++ b/tools/run-tests @@ -27,8 +27,6 @@ from utils import Process, Namespace, BarChart config = None intf_id = 0 -TEST_MAX_TIMEOUT = 240 - dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) def dbg(*s, **kwargs): @@ -52,7 +50,7 @@ def exit_vm(): p.kill() if config.ctx and config.ctx.results: - success = print_results(config.ctx.results) + success = print_results(config.ctx.results, int(config.ctx.args.timeout)) if config.ctx.args.result: write_results(config.ctx.args.result, config.ctx.results) @@ -917,7 +915,7 @@ def post_test(ctx, to_copy): except: pass -def print_results(results): +def print_results(results, max_timeout): table = PrettyTable(['Test', colored('Passed', 'green'), colored('Failed', 'red'), \ colored('Skipped', 'cyan'), colored('Time', 'yellow')]) @@ -928,7 +926,7 @@ def print_results(results): for test, result in results.items(): - if result.time == TEST_MAX_TIMEOUT: + if result.time == max_timeout: failed = "Timed out" passed = "Timed out" elif result.time == 0: @@ -975,7 +973,7 @@ def run_auto_tests(ctx, args): p.start() # Rather than time each subtest we just time the total but # mutiply the default time by the number of tests being run. - p.join(TEST_MAX_TIMEOUT * len(subtests)) + p.join(int(args.timeout) * len(subtests)) if p.is_alive(): # Timeout @@ -983,7 +981,7 @@ def run_auto_tests(ctx, args): ctx.results[os.path.basename(test)] = SimpleResult(run=0, failures=0, errors=0, - skipped=0, time=TEST_MAX_TIMEOUT) + skipped=0, time=int(args.timeout)) else: ctx.results[os.path.basename(test)] = rqueue.get() diff --git a/tools/runner.py b/tools/runner.py index 004bf46d..03f44611 100644 --- a/tools/runner.py +++ b/tools/runner.py @@ -120,9 +120,12 @@ class RunnerCoreArgParse(ArgumentParser): const=True, action='store', help='Use physical adapters for tests (passthrough)') + + # Hidden options only meant to be passed to the kernel self.add_argument('--testhome', help=SUPPRESS) self.add_argument('--monitor-parent', help=SUPPRESS) self.add_argument('--result-parent', help=SUPPRESS) + self.add_argument('--timeout', help=SUPPRESS) # Prevent --autotest/--unittest from being used together auto_unit_group = self.add_mutually_exclusive_group() @@ -385,6 +388,8 @@ class QemuRunner(RunnerAbstract): self._prepare_outfiles() + self.args.timeout = 240 + if args.hw: if os.path.isfile(args.hw): hw_conf = ConfigParser() @@ -543,6 +548,8 @@ class UmlRunner(RunnerAbstract): self._prepare_outfiles() + self.args.timeout = 1000 + kern_log = "ignore_loglevel" if "kernel" in args.verbose else "quiet" cmd = [args.kernel, 'rootfstype=hostfs', 'ro', 'mem=256M', 'mac80211_hwsim.radios=0', From patchwork Mon Nov 13 14:32:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13454053 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62C7421112 for ; Mon, 13 Nov 2023 14:33:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RoRid039" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1cc5b6d6228so26200205ad.2 for ; Mon, 13 Nov 2023 06:33:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699885979; x=1700490779; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mV0AbZpVBxclK+PGuWIXys3CukqLAC5+K6IbFXVhmYw=; b=RoRid039JClaN92DI/uDQyr1dyR6eDzNLwZ8OWjWNcbf9JLxl37TsB+1QHKK5mxKi6 OUJRV1CHcKX0gca8PpUINdI7PHKaVPjb8oeg4W4OhUUjIt/UyXRoW7eD9eY5SSPqmwdv T38Mk2p4geL4iGS3QRrEPMvTrJKhkyiXrzWEuLUuCKR4fQC0tdKUuBHJHKlAGGfMlSRU zzq/xekz4j+Rf595VmLocm+5TMbKqfQ6Mkpr5iWvfDMxNnED3sUYHVRYvIKbRDte4smM 68oyiEPV4WdTc4D3l1YUwXTHTM9imKkghimvow0YMd/Aqmyk55h1HxHofPOPsUy8uid8 VHaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699885979; x=1700490779; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mV0AbZpVBxclK+PGuWIXys3CukqLAC5+K6IbFXVhmYw=; b=nFmz12nJB5Cvkp+Xr8Kf4hAP9KZEAolsQ1teBoWkT1HcxGeLjyCbmOkS2mRpxrkxT8 zEwFqVrMNY46brKWgUoRi8oadjHwDhNj2vilX0F8tApl7Ig6DpvenlebeASStLebLIkM SPWe82VQYXEiEl7eA9n/J1jLaxT+sIPVqxZwM0Kyzx1KkiACmjR2CYsZ+VfZdbG53Fgm Ho7yXpzu1IRosVBY+jDDpjFv86TtWl0En7ijLIsBSt7QXTVoZBX6n+d8JEEU7QGGjyzz a18hgyljQpzhrjCGi2ftcny2WfW0N2DyHssA5rUPmM8o9dl+8MMzPEmhne7UMnXy2hzt 6bTg== X-Gm-Message-State: AOJu0Yz1IjeQSujJP/6ELtZzzuD1VcI69mowOsZMTc8ThTkyZq0qadEk QeI+dX5BUFlG2nGSi85E4QwLh99JjPU= X-Google-Smtp-Source: AGHT+IG2FO3oZJg4PrdKgEQ9krO8sKIDQ+zv0y8FZmodYi8MSQKVwnTx3IjZ2SaXlBvy7uIiqGFx6g== X-Received: by 2002:a17:903:188:b0:1cc:474d:bdf9 with SMTP id z8-20020a170903018800b001cc474dbdf9mr5685005plg.36.1699885979457; Mon, 13 Nov 2023 06:32:59 -0800 (PST) Received: from localhost.localdomain ([50.39.172.77]) by smtp.gmail.com with ESMTPSA id b7-20020a170902d50700b001cc25cfec58sm4071496plg.226.2023.11.13.06.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 06:32:59 -0800 (PST) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 2/3] auto-t: add stop APIs and fix some issues wpas.py Date: Mon, 13 Nov 2023 06:32:54 -0800 Message-Id: <20231113143255.278191-2-prestwoj@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231113143255.278191-1-prestwoj@gmail.com> References: <20231113143255.278191-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 - wait_for_event was returning a list in certain cases, not the event itself - The configurator ID was not being printed (',' instead of '%') - The DPP ID was not being properly waited for with PKEX --- autotests/util/wpas.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/autotests/util/wpas.py b/autotests/util/wpas.py index eab08b43..0b127672 100644 --- a/autotests/util/wpas.py +++ b/autotests/util/wpas.py @@ -76,7 +76,7 @@ class Wpas: for e in self._rx_data: if event in e: - return self._rx_data + return e return False @@ -281,7 +281,7 @@ class Wpas: self._dpp_conf_id = self.wait_for_result() if not uri: - print("DPP Configurator ID: %s", self._dpp_conf_id) + print("DPP Configurator ID: %s" % self._dpp_conf_id) return self._rx_data = [] @@ -315,6 +315,8 @@ class Wpas: self._rx_data = [] self._ctrl_request(cmd) self._dpp_id = self.wait_for_result() + while not self._dpp_id.isnumeric(): + self._dpp_id = self.wait_for_result() def dpp_pkex_add(self, code, identifier=None, version=None, initiator=False, role=None): cmd = f'DPP_PKEX_ADD own={self._dpp_id}' @@ -336,10 +338,18 @@ class Wpas: self._rx_data = [] self._ctrl_request(cmd) + def dpp_pkex_remove(self): + self._rx_data = [] + self._ctrl_request("DPP_PKEX_REMOVE *") + def dpp_listen(self, freq): self._rx_data = [] self._ctrl_request(f'DPP_LISTEN {freq}') + def dpp_stop_listen(self): + self._rx_data = [] + self._ctrl_request("DPP_STOP_LISTEN") + def dpp_configurator_remove(self): self._ctrl_request('DPP_CONFIGURATOR_REMOVE *') self.wait_for_result() From patchwork Mon Nov 13 14:32:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13454054 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DE7821110 for ; Mon, 13 Nov 2023 14:33:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EgSSscGR" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1cc329ce84cso39792305ad.2 for ; Mon, 13 Nov 2023 06:33:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699885980; x=1700490780; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wJPufJknNSkjCqoVwzFryN5LChMX9+VklA1OTY6hHGQ=; b=EgSSscGRfgwZtnnt4Fx7EdK1eG0HYyUHifsfvV4iqQgjGO7MrW/E8pa6j5/tatb2b0 OJKL8EE4lPpSxVxCuixnLJTcBuHO9y0H5sFpmVHhTWhx/KLZ3agldE9vAl/gsQppDeea lnlxzOwFFyW0Q2jGtkfNGpG3AUxXFbooWIp70QKBITYqArmHb9bEMXo5I/EGTOzqqtsm NumvZ+17PrAdY6FLZrU7RJnjAQ8Qp3hoQ+lKu9EJoKDl5d/pqpOzZZnrX6amoezttRpB AcudETxWwGnAnwV8RmMUIS3UK0SAf7nQTiPJihkcBP2DbGHd/Tg2qSN9p0uNRpMTwgVL Qkyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699885980; x=1700490780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wJPufJknNSkjCqoVwzFryN5LChMX9+VklA1OTY6hHGQ=; b=pTN3r2awbBcfvR/yOPZt6dOoHLLkaPAEgSIJeCaP918fi7AEKwysfMp2qDStd7whD4 EvsPIUDqfIC8aBlHAedz6oIrWk3EPCQStNSQOg+e9h4QXP9T8VjqXD3lxyzIlfHCt7b5 PBGyQctVTXxs+UimeBwDSk7aPJLUe35wvje7k28v9gMIee+//O8OURP0y/pyNBoGtSSl aKd0Y89O2aFO5gKV3cYWNTUFxK3hPES/b0F46m6OMexR3MgwGBcbwyKQS0DcxYM+Zz/V lRTPwFCbXxSf+4BUmThQs5ONrApWzbJEr6mtAnOhNP4DCExyUCH2Ic7SMVzhlgyIUUbD 8WxQ== X-Gm-Message-State: AOJu0YzvgcspJHwmWayTsjkVbWtIxV+Qf9zCFuuot5XfzdOxzuyHhgrl c1aKmkAzIM+3S+mKU1Jscggnpj1vE2w= X-Google-Smtp-Source: AGHT+IENHft7ODvJRm+vF922QtrzDH1K/6006+sheoygoQYgpy+fdMSbCoRhKG6zGFCKH1z0F97oFg== X-Received: by 2002:a17:902:e885:b0:1cc:5505:fff3 with SMTP id w5-20020a170902e88500b001cc5505fff3mr9415051plg.30.1699885980509; Mon, 13 Nov 2023 06:33:00 -0800 (PST) Received: from localhost.localdomain ([50.39.172.77]) by smtp.gmail.com with ESMTPSA id b7-20020a170902d50700b001cc25cfec58sm4071496plg.226.2023.11.13.06.32.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 06:32:59 -0800 (PST) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 3/3] auto-t: get DPP PKEX test running reliably Date: Mon, 13 Nov 2023 06:32:55 -0800 Message-Id: <20231113143255.278191-3-prestwoj@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231113143255.278191-1-prestwoj@gmail.com> References: <20231113143255.278191-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Several tests do not pass due to some additional changes that have not been merged. Remove these cases and add some hardening after discovering some unfortunate wpa_supplicant behavior. - Disable p2p in wpa_supplicant. With p2p enabled an extra device is created which starts receiving DPP frames and printing confusing messages. - Remove extra asserts which don't make sense currently. These will be added back later as future additions to PKEX are upstreamed. - Work around wpa_supplicant retransmit limitation. This is described in detail in the comment in pkex_test.py --- autotests/testDPP/pkex_test.py | 56 ++++++++++++++++++++++++++++------ autotests/testDPP/wpas.conf | 1 + 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/autotests/testDPP/pkex_test.py b/autotests/testDPP/pkex_test.py index a568e619..6c5cf054 100644 --- a/autotests/testDPP/pkex_test.py +++ b/autotests/testDPP/pkex_test.py @@ -21,6 +21,11 @@ class Test(unittest.TestCase): self.wpas.dpp_configurator_create() self.wpas.dpp_listen(2437) + def stop_wpas_pkex(self): + self.wpas.dpp_pkex_remove() + self.wpas.dpp_stop_listen() + self.wpas.dpp_configurator_remove() + def start_iwd_pkex_configurator(self, device, agent=False): self.hapd.reload() self.hapd.wait_for_event('AP-ENABLED') @@ -38,11 +43,51 @@ class Test(unittest.TestCase): else: device.dpp_pkex_configure_enrollee('secret123', identifier="test") + # + # WPA Supplicant has awful handling of retransmissions and no-ACK + # conditions. It only handles retransmitting the exchange request when + # there is no-ACK, which makes zero sense since its a broadcast... + # + # So, really, testing against wpa_supplicant is fragile and dependent on + # how the scheduling works out. If IWD doesn't ACK due to being on the + # next frequency or in between offchannel requests wpa_supplicant gets + # into a state where it thinks a PKEX session has been started (having + # received the exchange request) but will only accept commit-reveal + # frames. IWD is unaware because it never got a response so it keeps + # sending exchange requests which are ignored. + # + # Nevertheless we should still test against wpa_supplicant for + # compatibility so attempt to detect this case and restart the + # wpa_supplicant configurator. + # + def restart_wpas_if_needed(self): + i = 0 + + while i < 10: + data = self.wpas.wait_for_event("DPP-RX") + self.assertIn("type=7", data) + + data = self.wpas.wait_for_event("DPP-TX") + self.assertIn("type=8", data) + + data = self.wpas.wait_for_event("DPP-TX-STATUS") + if "result=no-ACK" in data: + self.stop_wpas_pkex() + self.start_wpas_pkex('secret123', identifier="test") + else: + return + + i += 1 + + raise Exception("wpa_supplicant could not complete PKEX after 10 retries") + def test_pkex_iwd_as_enrollee(self): self.start_wpas_pkex('secret123', identifier="test") self.device[0].dpp_pkex_enroll('secret123', identifier="test") + self.restart_wpas_if_needed() + self.wpas.wait_for_event("DPP-AUTH-SUCCESS") def test_pkex_iwd_as_enrollee_retransmit(self): @@ -52,6 +97,8 @@ class Test(unittest.TestCase): self.device[0].dpp_pkex_enroll('secret123', identifier="test") + self.restart_wpas_if_needed() + self.wpas.wait_for_event("DPP-AUTH-SUCCESS") def test_pkex_unsupported_version(self): @@ -121,15 +168,6 @@ class Test(unittest.TestCase): condition = 'obj.state == DeviceState.connected' self.wd.wait_for_object_condition(self.device[1], condition) - self.assertTrue(os.path.exists('/tmp/ns0/ssidCCMP.psk')) - - with open('/tmp/ns0/ssidCCMP.psk') as f: - data = f.read() - - self.assertIn("SendHostname", data) - self.assertIn("SharedCode=secret123", data) - self.assertIn("ExactConfig=true", data) - def test_pkex_configurator_with_agent(self): self.start_iwd_pkex_configurator(self.device[0], agent=True) diff --git a/autotests/testDPP/wpas.conf b/autotests/testDPP/wpas.conf index 521fb29b..19df4350 100644 --- a/autotests/testDPP/wpas.conf +++ b/autotests/testDPP/wpas.conf @@ -3,3 +3,4 @@ ctrl_interface=/tmp/rad1-p2p-wpas update_config=0 pmf=2 dpp_config_processing=2 +p2p_disabled=1