merge core-8-6-branch

1 files changed, 16 insertions, 1 deletions

diff --git a/tests/socket.test b/tests/socket.test
index 9a09c0f..d3d56fa 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -74,7 +74,22 @@ testConstraint exec [llength [info commands exec]]
 
 # Produce a random port number in the Dynamic/Private range
 # from 49152 through 65535.
-proc randport {} { expr {int(rand()*16383+49152)} }
+proc randport {} {
+    # firstly try dynamic port via server-socket(0):
+    set port 0x7fffffff
+    catch {
+	set port [lindex [fconfigure [set s [socket -server {} 0]] -sockname] 2]
+	close $s
+    }
+    while {[catch {
+	close [socket -server {} $port]
+    } msg]} {
+	if {[incr i] > 1000} {return -code error "too many iterations to get free random port: $msg"}
+	# try random port:
+	set port [expr {int(rand()*16383+49152)}]
+    }
+    return $port
+}
 
 # Check if testsocket testflags is available
 testConstraint testsocket_testflags [expr {![catch {