From ea65e37beea96207b6fa64959112dc7ba6e44b3c Mon Sep 17 00:00:00 2001 From: Kuba Brecka Date: Mon, 8 Sep 2014 17:06:54 +0000 Subject: Fix test failure for test/functionalities/connect_remote/TestConnectRemote.py when port 12345 is already in use Reviewed at http://reviews.llvm.org/D5221 llvm-svn: 217388 --- lldb/test/functionalities/connect_remote/TestConnectRemote.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lldb/test/functionalities/connect_remote/TestConnectRemote.py') diff --git a/lldb/test/functionalities/connect_remote/TestConnectRemote.py b/lldb/test/functionalities/connect_remote/TestConnectRemote.py index 7b838b6f495..fed832dbf55 100644 --- a/lldb/test/functionalities/connect_remote/TestConnectRemote.py +++ b/lldb/test/functionalities/connect_remote/TestConnectRemote.py @@ -5,6 +5,7 @@ Test lldb 'process connect' command. import os import unittest2 import lldb +import re from lldbtest import * class ConnectRemoteTestCase(TestBase): @@ -12,7 +13,7 @@ class ConnectRemoteTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) def test_connect_remote(self): - """Test "process connect connect:://localhost:12345".""" + """Test "process connect connect:://localhost:[port]".""" import pexpect # First, we'll start a fake debugserver (a simple echo server). @@ -28,10 +29,13 @@ class ConnectRemoteTestCase(TestBase): self.addTearDownHook(shutdown_fakeserver) # Wait until we receive the server ready message before continuing. - fakeserver.expect_exact('Listening on localhost:12345') + line = fakeserver.readline() + self.assertTrue(line.startswith("Listening on localhost:")) + port = int(re.match('Listening on localhost:([0-9]+)', line).group(1)) + self.assertTrue(port > 0) # Connect to the fake server.... - self.runCmd("process connect -p gdb-remote connect://localhost:12345") + self.runCmd("process connect -p gdb-remote connect://localhost:" + str(port)) if __name__ == '__main__': -- cgit v1.2.3