Rainbows! Rack HTTP server user/dev discussion
 help / Atom feed
* [PATCH] tests: use correct file:// URL for random_blob path
@ 2016-11-17  2:41 Eric Wong
  0 siblings, 0 replies; 1+ messages in thread
From: Eric Wong @ 2016-11-17  2:41 UTC (permalink / raw)
  To: rainbows-public

Apparently RFC1738 designates hostname support for file:// and
curl historically had this wrong, but my current curl version
(7.38.0-4+deb8u5 from Debian 8) is stricter.  Anyways, this seems
to handle $PWD with spaces and possibly other strange
characters, so URL encoding here doesn't seem to be strictly
necssary.
---
 t/byte-range-common.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/t/byte-range-common.sh b/t/byte-range-common.sh
index 2c12a8b..3418394 100644
--- a/t/byte-range-common.sh
+++ b/t/byte-range-common.sh
@@ -34,14 +34,15 @@ check_content_range () {
 }
 
 t_begin "read random blob sha1s" && {
-	sha1_head=$(curl -sSff $range_head file://random_blob | rsha1)
-	sha1_tail=$(curl -sSff $range_tail file://random_blob | rsha1)
-	sha1_mid=$(curl -sSff $range_mid file://random_blob | rsha1)
-	sha1_n1=$(curl -sSff $range_n1 file://random_blob | rsha1)
-	sha1_n2=$(curl -sSff $range_n2 file://random_blob | rsha1)
-	sha1_1b_head=$(curl -sSff $range_1b_head file://random_blob | rsha1)
-	sha1_1b_tail=$(curl -sSff $range_1b_tail file://random_blob | rsha1)
-	sha1_1b_mid=$(curl -sSff $range_1b_mid file://random_blob | rsha1)
+	file="file://$(pwd)/random_blob"
+	sha1_head=$(curl -sSff $range_head $file | rsha1)
+	sha1_tail=$(curl -sSff $range_tail $file | rsha1)
+	sha1_mid=$(curl -sSff $range_mid $file | rsha1)
+	sha1_n1=$(curl -sSff $range_n1 $file | rsha1)
+	sha1_n2=$(curl -sSff $range_n2 $file | rsha1)
+	sha1_1b_head=$(curl -sSff $range_1b_head $file | rsha1)
+	sha1_1b_tail=$(curl -sSff $range_1b_tail $file | rsha1)
+	sha1_1b_mid=$(curl -sSff $range_1b_mid $file | rsha1)
 	sha1_all=$(rsha1 < random_blob)
 	echo "$sha1_all=$sha1_n1"
 }
-- 
EW


^ permalink raw reply	[flat|threaded] 1+ messages in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-17  2:41 [PATCH] tests: use correct file:// URL for random_blob path Eric Wong

Rainbows! Rack HTTP server user/dev discussion

Archives are clonable:
	git clone --mirror https://bogomips.org/rainbows-public
	git clone --mirror http://ou63pmih66umazou.onion/rainbows-public

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.lang.ruby.rainbows
	nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.rainbows

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox