--- a/mercurial/hgweb/server.py Sun Jul 05 13:09:22 2020 +0200
+++ b/mercurial/hgweb/server.py Mon Jul 06 22:02:50 2020 -0400
@@ -382,7 +382,7 @@
self.errorlog = elog
self.addr, self.port = self.socket.getsockname()[0:2]
- self.fqaddr = socket.getfqdn(addr[0])
+ self.fqaddr = self.server_name
self.serverheader = ui.config(b'web', b'server-header')
--- a/tests/run-tests.py Sun Jul 05 13:09:22 2020 +0200
+++ b/tests/run-tests.py Mon Jul 06 22:02:50 2020 -0400
@@ -3681,7 +3681,7 @@
for p in osenvironb.get(b'PATH', dpb).split(sepb):
name = os.path.join(p, program)
if os.name == 'nt' or os.access(name, os.X_OK):
- return name
+ return _bytes2sys(name)
return None
def _checktools(self):
@@ -3692,7 +3692,7 @@
found = self._findprogram(p)
p = p.decode("utf-8")
if found:
- vlog("# Found prerequisite", p, "at", _bytes2sys(found))
+ vlog("# Found prerequisite", p, "at", found)
else:
print("WARNING: Did not find prerequisite tool: %s " % p)
--- a/tests/test-gpg.t Sun Jul 05 13:09:22 2020 +0200
+++ b/tests/test-gpg.t Mon Jul 06 22:02:50 2020 -0400
@@ -35,6 +35,7 @@
$ hg sigs
$ HGEDITOR=cat hg sign -e 0
+ gpg: error retrieving key fingerprint from card: Invalid name (?)
signing 0:e63c23eaa88a
Added signature for changeset e63c23eaa88a
--- a/tests/test-serve.t Sun Jul 05 13:09:22 2020 +0200
+++ b/tests/test-serve.t Mon Jul 06 22:02:50 2020 -0400
@@ -99,4 +99,11 @@
$LOCALIP - - [$LOGDATE$] "GET /some/dir7?cmd=capabilities HTTP/1.1" 404 - (glob)
$LOCALIP - - [$LOGDATE$] "GET /some?cmd=capabilities HTTP/1.1" 404 - (glob)
+ $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
+
+issue6362: Previously, this crashed on Python 3
+
+ $ hg serve -a 0.0.0.0 -d
+ listening at http://*:$HGPORT1/ (bound to *:$HGPORT1) (glob)
+
$ cd ..