##// END OF EJS Templates
tests: add a substitution for EADDRINUSE/WSAEADDRINUSE messages...
Matt Harbison -
r35233:1b22d325 default
parent child Browse files
Show More
@@ -61,6 +61,14 b' substitutions = ['
61 # FormatMessage(WSAECONNRESET)
61 # FormatMessage(WSAECONNRESET)
62 br'An existing connection was forcibly closed by the remote host',
62 br'An existing connection was forcibly closed by the remote host',
63 ),
63 ),
64 br'$EADDRINUSE$': (
65 # strerror()
66 br'Address already in use',
67
68 # FormatMessage(WSAEADDRINUSE)
69 br'Only one usage of each socket address'
70 br' \(protocol/network address/port\) is normally permitted',
71 ),
64 }
72 }
65
73
66 for replace, msgs in _errors.items():
74 for replace, msgs in _errors.items():
@@ -26,15 +26,10 b' parts that are not bundle1/bundle2 speci'
26
26
27 Test server address cannot be reused
27 Test server address cannot be reused
28
28
29 #if windows
30 $ hg serve -p $HGPORT1 2>&1
29 $ hg serve -p $HGPORT1 2>&1
31 abort: cannot start server at 'localhost:$HGPORT1': * (glob)
30 abort: cannot start server at 'localhost:$HGPORT1': $EADDRINUSE$
32 [255]
31 [255]
33 #else
32
34 $ hg serve -p $HGPORT1 2>&1
35 abort: cannot start server at 'localhost:$HGPORT1': Address already in use
36 [255]
37 #endif
38 $ cd ..
33 $ cd ..
39 $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
34 $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
40
35
@@ -17,15 +17,10 b''
17
17
18 Test server address cannot be reused
18 Test server address cannot be reused
19
19
20 #if windows
21 $ hg serve -p $HGPORT1 2>&1
20 $ hg serve -p $HGPORT1 2>&1
22 abort: cannot start server at 'localhost:$HGPORT1': * (glob)
21 abort: cannot start server at 'localhost:$HGPORT1': $EADDRINUSE$
23 [255]
22 [255]
24 #else
23
25 $ hg serve -p $HGPORT1 2>&1
26 abort: cannot start server at 'localhost:$HGPORT1': Address already in use
27 [255]
28 #endif
29 $ cd ..
24 $ cd ..
30 $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
25 $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
31
26
@@ -34,15 +34,10 b' cacert not found'
34
34
35 Test server address cannot be reused
35 Test server address cannot be reused
36
36
37 #if windows
38 $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
37 $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
39 abort: cannot start server at 'localhost:$HGPORT': * (glob)
38 abort: cannot start server at 'localhost:$HGPORT': $EADDRINUSE$
40 [255]
39 [255]
41 #else
40
42 $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
43 abort: cannot start server at 'localhost:$HGPORT': Address already in use
44 [255]
45 #endif
46 $ cd ..
41 $ cd ..
47
42
48 Our test cert is not signed by a trusted CA. It should fail to verify if
43 Our test cert is not signed by a trusted CA. It should fail to verify if
General Comments 0
You need to be logged in to leave comments. Login now