test-http and test-https: partially adapt for Windows
authorAdrian Buehlmann <adrian@cadifra.com>
Tue, 19 Jun 2012 19:45:00 +0200
changeset 17023 3e2d8120528b
parent 17022 8a38839ae1dc
child 17027 6c05eebd9fab
test-http and test-https: partially adapt for Windows
tests/test-http.t
tests/test-https.t
--- a/tests/test-http.t	Wed Jun 20 02:09:49 2012 +0300
+++ b/tests/test-http.t	Tue Jun 19 19:45:00 2012 +0200
@@ -17,9 +17,15 @@
 
 Test server address cannot be reused
 
+#if windows
+  $ hg serve -p $HGPORT1 2>&1
+  abort: cannot start server at ':$HGPORT1': * (glob)
+  [255]
+#else
   $ hg serve -p $HGPORT1 2>&1
   abort: cannot start server at ':$HGPORT1': Address already in use
   [255]
+#endif
   $ cd ..
   $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
 
--- a/tests/test-https.t	Wed Jun 20 02:09:49 2012 +0300
+++ b/tests/test-https.t	Tue Jun 19 19:45:00 2012 +0200
@@ -104,9 +104,15 @@
 
 Test server address cannot be reused
 
+#if windows
+  $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
+  abort: cannot start server at ':$HGPORT': (glob)
+  [255]
+#else
   $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
   abort: cannot start server at ':$HGPORT': Address already in use
   [255]
+#endif
   $ cd ..
 
 clone via pull