Mercurial > hg
comparison tests/test-hgwebdir.t @ 31769:594dd384803c
test-serve: make the 'listening at *' lines optional
The daemonized serve process doesn't print these lines out (see 448d0c452140).
I was able to get it to with the following hack:
diff --git a/mercurial/win32.py b/mercurial/win32.py
--- a/mercurial/win32.py
+++ b/mercurial/win32.py
@@ -418,6 +418,11 @@
return str(ppid)
def spawndetached(args):
+
+ import subprocess
+ return subprocess.Popen(args, cwd=pycompat.getcwd(), env=encoding.environ,
+ creationflags=subprocess.CREATE_NEW_PROCESS_GROUP).pid
+
# No standard library function really spawns a fully detached
# process under win32 because they allocate pipes or other objects
# to handle standard streams communications. Passing these objects
However, MSYS translates --prefixes starting with '/' to 'C:/MinGW/msys/1.0',
which changes the output. The output isn't so important that I want to spend a
bunch of time on this, and risk breaking some subtle behavior of `hg serve -d`
with the more complicated code.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 02 Apr 2017 00:56:52 -0400 |
parents | da7d19324b1e |
children | bd3cb917761a |
comparison
equal
deleted
inserted
replaced
31768:49e9124cfc23 | 31769:594dd384803c |
---|---|
1419 > address = localhost | 1419 > address = localhost |
1420 > port = $HGPORT1 | 1420 > port = $HGPORT1 |
1421 > EOF | 1421 > EOF |
1422 $ hg serve -d --pid-file=hg.pid --web-conf paths.conf \ | 1422 $ hg serve -d --pid-file=hg.pid --web-conf paths.conf \ |
1423 > -A access-paths.log -E error-paths-9.log | 1423 > -A access-paths.log -E error-paths-9.log |
1424 listening at http://*:$HGPORT1/ (bound to *$LOCALIP*:$HGPORT1) (glob) | 1424 listening at http://*:$HGPORT1/ (bound to *$LOCALIP*:$HGPORT1) (glob) (?) |
1425 $ cat hg.pid >> $DAEMON_PIDS | 1425 $ cat hg.pid >> $DAEMON_PIDS |
1426 $ get-with-headers.py localhost:$HGPORT1 '?style=raw' | 1426 $ get-with-headers.py localhost:$HGPORT1 '?style=raw' |
1427 200 Script output follows | 1427 200 Script output follows |
1428 | 1428 |
1429 | 1429 |
1431 test --port option overrides web.port: | 1431 test --port option overrides web.port: |
1432 | 1432 |
1433 $ killdaemons.py | 1433 $ killdaemons.py |
1434 $ hg serve -p $HGPORT2 -d -v --pid-file=hg.pid --web-conf paths.conf \ | 1434 $ hg serve -p $HGPORT2 -d -v --pid-file=hg.pid --web-conf paths.conf \ |
1435 > -A access-paths.log -E error-paths-10.log | 1435 > -A access-paths.log -E error-paths-10.log |
1436 listening at http://*:$HGPORT2/ (bound to *$LOCALIP*:$HGPORT2) (glob) | 1436 listening at http://*:$HGPORT2/ (bound to *$LOCALIP*:$HGPORT2) (glob) (?) |
1437 $ cat hg.pid >> $DAEMON_PIDS | 1437 $ cat hg.pid >> $DAEMON_PIDS |
1438 $ get-with-headers.py localhost:$HGPORT2 '?style=raw' | 1438 $ get-with-headers.py localhost:$HGPORT2 '?style=raw' |
1439 200 Script output follows | 1439 200 Script output follows |
1440 | 1440 |
1441 | 1441 |