Patchwork [4,of,4] test-static-http: fix broken path sorting on Windows

login
register
mail settings
Submitter Matt Harbison
Date Oct. 29, 2017, 5:09 a.m.
Message ID <8f5cbf8bdf417a1f3c23.1509253785@Envy>
Download mbox | patch
Permalink /patch/25306/
State Accepted
Headers show

Comments

Matt Harbison - Oct. 29, 2017, 5:09 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1509249192 14400
#      Sat Oct 28 23:53:12 2017 -0400
# Branch stable
# Node ID 8f5cbf8bdf417a1f3c23a790b610aa9d408332a5
# Parent  ba57926f2b4ccc2ded732b60c7da40544d524eb3
test-static-http: fix broken path sorting on Windows

Some of the paths output had '\', throwing off the order.  Globbing in the test
didn't help, because `sort` sees the pre-globbed path.
Yuya Nishihara - Oct. 29, 2017, 7:30 a.m.
On Sun, 29 Oct 2017 01:09:45 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1509249192 14400
> #      Sat Oct 28 23:53:12 2017 -0400
> # Branch stable
> # Node ID 8f5cbf8bdf417a1f3c23a790b610aa9d408332a5
> # Parent  ba57926f2b4ccc2ded732b60c7da40544d524eb3
> test-static-http: fix broken path sorting on Windows
> 
> Some of the paths output had '\', throwing off the order.  Globbing in the test
> didn't help, because `sort` sees the pre-globbed path.

This one is a real bug. '\' shouldn't appear in access log of HTTP server.

Patch

diff --git a/tests/test-static-http.t b/tests/test-static-http.t
--- a/tests/test-static-http.t
+++ b/tests/test-static-http.t
@@ -218,7 +218,7 @@ 
 
 List of files accessed over HTTP:
 
-  $ cat server.log | sed -n -e 's|.*GET \(/[^ ]*\).*|\1|p' | sort -u
+  $ cat server.log | sed -n -e 's|\\|/|g' -e 's|.*GET \(/[^ ]*\).*|\1|p' | sort -u
   /.hg/bookmarks
   /.hg/bookmarks.current
   /.hg/cache/hgtagsfnodes1