From 6c31db6766df3bdeb1ff6039e651a54850b68aa3 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 7 Nov 2024 18:38:46 +0100 Subject: [PATCH] tests: py: Fix for storing payload into missing file JIRA: https://issues.redhat.com/browse/RHEL-65346 Upstream Status: nftables commit c1c0c54e237c880adaa8172b93d7450e6c617cfc commit c1c0c54e237c880adaa8172b93d7450e6c617cfc Author: Phil Sutter Date: Wed Oct 2 19:55:49 2024 +0200 tests: py: Fix for storing payload into missing file When running a test for which no corresponding *.payload file exists, the *.payload.got file name was incorrectly constructed due to 'payload_path' variable not being set. Fixes: 2cfab7a3e10fc ("tests/py: Write dissenting payload into the right file") Signed-off-by: Phil Sutter Signed-off-by: Phil Sutter --- tests/py/nft-test.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/py/nft-test.py b/tests/py/nft-test.py index 00799e2..7acdb77 100755 --- a/tests/py/nft-test.py +++ b/tests/py/nft-test.py @@ -769,10 +769,9 @@ def rule_add(rule, filename, lineno, force_all_family_option, filename_path): if rule[1].strip() == "ok": payload_expected = None - payload_path = None + payload_path = "%s.payload" % filename_path try: - payload_log = open("%s.payload" % filename_path) - payload_path = payload_log.name + payload_log = open(payload_path) payload_expected = payload_find_expected(payload_log, rule[0]) except: payload_log = None