From patchwork Tue Dec 29 05:40:00 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [3,of,3,v2] run-tests: validate cached port in _getport
From: timeless@mozdev.org
X-Patchwork-Id: 12391
Message-Id: <ecd36680cdf2dd638645.1451367600@waste.org>
To: mercurial-devel@selenic.com
Date: Mon, 28 Dec 2015 23:40:00 -0600

# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1451364276 0
#      Tue Dec 29 04:44:36 2015 +0000
# Node ID ecd36680cdf2dd63864505f60ee14ed3ef84e864
# Parent  a12404484af03ddddbd326af08ca1217b77ebc13
run-tests: validate cached port in _getport

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -2012,9 +2012,9 @@
         return True
 
     def _getport(self, count):
+        portneeded = 3
         port = self._ports.get(count) # do we have a cached entry?
-        if port is None:
-            portneeded = 3
+        if port is None or not self._checkportrange(port, portneeded):
             # above 100 tries we just give up and let test reports failure
             for tries in xrange(100):
                 port = self.options.port + self._portoffset