moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 17:18:48 -05:00
Code Issues Releases Wiki Activity

tests: support non-localhost HOSTIP for dict/smb servers

Browse Source 
smbserver.py/dictserver.py were explicitly using localhost/127.0.0.1 for
binding the server which when we were running the tests with a separate
HOSTIP and CLIENTIP had failures verifying the server from the device we
were testing.

This changes them to take the address from runtests.py and default to
localhost/127.0.0.1 if none is given.

Closes #4048
This commit is contained in:
Stephan Szabo 2019-06-19 15:54:18 -07:00 committed by Daniel Stenberg
parent cf35bd79bd
commit 2aff76c571
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/dictserver.py
View File

@ -33,7 +33,7 @@ def dictserver(options):
with open(options.pidfile, "w") as f: with open(options.pidfile, "w") as f:
f.write("{0}".format(pid)) f.write("{0}".format(pid))
local_bind = (HOST, options.port) local_bind = (options.host, options.port)
log.info("[DICT] Listening on %s", local_bind) log.info("[DICT] Listening on %s", local_bind)
# Need to set the allow_reuse on the class, not on the instance. # Need to set the allow_reuse on the class, not on the instance.
@ -83,6 +83,8 @@ def get_options():
parser.add_argument("--port", action="store", default=9016, parser.add_argument("--port", action="store", default=9016,
type=int, help="port to listen on") type=int, help="port to listen on")
parser.add_argument("--host", action="store", default=HOST,
help="host to listen on")
parser.add_argument("--verbose", action="store", type=int, default=0, parser.add_argument("--verbose", action="store", type=int, default=0,
help="verbose output") help="verbose output")
parser.add_argument("--pidfile", action="store", parser.add_argument("--pidfile", action="store",

6
tests/runtests.pl
View File

@ -2203,7 +2203,8 @@ sub rundictserver {
$flags .= "--verbose 1 " if($debugprotocol); $flags .= "--verbose 1 " if($debugprotocol);
$flags .= "--pidfile \"$pidfile\" --logfile \"$logfile\" "; $flags .= "--pidfile \"$pidfile\" --logfile \"$logfile\" ";
$flags .= "--id $idnum " if($idnum > 1); $flags .= "--id $idnum " if($idnum > 1);
$flags .= "--port $port --srcdir \"$srcdir\""; $flags .= "--port $port --srcdir \"$srcdir\" ";
$flags .= "--host $HOSTIP";
my $cmd = "$srcdir/dictserver.py $flags"; my $cmd = "$srcdir/dictserver.py $flags";
my ($dictpid, $pid2) = startnew($cmd, $pidfile, 15, 0); my ($dictpid, $pid2) = startnew($cmd, $pidfile, 15, 0);
@ -2279,7 +2280,8 @@ sub runsmbserver {
$flags .= "--verbose 1 " if($debugprotocol); $flags .= "--verbose 1 " if($debugprotocol);
$flags .= "--pidfile \"$pidfile\" --logfile \"$logfile\" "; $flags .= "--pidfile \"$pidfile\" --logfile \"$logfile\" ";
$flags .= "--id $idnum " if($idnum > 1); $flags .= "--id $idnum " if($idnum > 1);
$flags .= "--port $port --srcdir \"$srcdir\""; $flags .= "--port $port --srcdir \"$srcdir\" ";
$flags .= "--host $HOSTIP";
my $cmd = "$srcdir/smbserver.py $flags"; my $cmd = "$srcdir/smbserver.py $flags";
my ($smbpid, $pid2) = startnew($cmd, $pidfile, 15, 0); my ($smbpid, $pid2) = startnew($cmd, $pidfile, 15, 0);

4
tests/smbserver.py
View File

@ -86,7 +86,7 @@ def smbserver(options):
test_data_dir = os.path.join(options.srcdir, "data") test_data_dir = os.path.join(options.srcdir, "data")
smb_server = TestSmbServer(("127.0.0.1", options.port), smb_server = TestSmbServer((options.host, options.port),
config_parser=smb_config, config_parser=smb_config,
test_data_directory=test_data_dir) test_data_directory=test_data_dir)
log.info("[SMB] setting up SMB server on port %s", options.port) log.info("[SMB] setting up SMB server on port %s", options.port)
@ -312,6 +312,8 @@ def get_options():
parser.add_argument("--port", action="store", default=9017, parser.add_argument("--port", action="store", default=9017,
type=int, help="port to listen on") type=int, help="port to listen on")
parser.add_argument("--host", action="store", default="127.0.0.1",
help="host to listen on")
parser.add_argument("--verbose", action="store", type=int, default=0, parser.add_argument("--verbose", action="store", type=int, default=0,
help="verbose output") help="verbose output")
parser.add_argument("--pidfile", action="store", parser.add_argument("--pidfile", action="store",