From: Tom Krizek <tkrizek@isc.org>
Date: Tue, 30 May 2023 12:11:14 +0000 (+0200)
Subject: Fix base_port calculation in pytest runner
X-Git-Tag: v9.19.14~19^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8ea6b610b775f3afe34b76883385b9ab53cf462;p=thirdparty%2Fbind9.git

Fix base_port calculation in pytest runner

The selected base port should be in the range <port_min, port_max), the
formula was incorrect.

Credit for discovering this fault goes to Ondrej Sury.
---

diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py
index efcc2f51ff3..9294198ba19 100644
--- a/bin/tests/system/conftest.py
+++ b/bin/tests/system/conftest.py
@@ -312,7 +312,7 @@ else:
         # worker threads, multiple tests may have same port values assigned. If
         # these tests are then executed simultaneously, the test results will
         # be misleading.
-        base_port = int(time.time() // 3600) % (port_max - port_min)
+        base_port = int(time.time() // 3600) % (port_max - port_min) + port_min
 
         return {mod: base_port + i * PORTS_PER_TEST for i, mod in enumerate(modules)}