From c844fffef2b74138abf286e3c75e8b902b1e4c93 Mon Sep 17 00:00:00 2001
From: Christian Couder <chriscool@tuxfamily.org>
Date: Fri, 27 Feb 2015 22:09:11 +0100
Subject: [PATCH 1/5] t0111: fix broken test due to bad double quoting

There was basically:

  curl ... "$URL 2>curl.out"

instead of:

  curl ... "$URL" 2>curl.out

So "curl.out" was not properly overwritten by the curl command.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 test/sharness/t0111-gateway-writable.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/test/sharness/t0111-gateway-writable.sh b/test/sharness/t0111-gateway-writable.sh
index ca0271e89..ca66c04e5 100755
--- a/test/sharness/t0111-gateway-writable.sh
+++ b/test/sharness/t0111-gateway-writable.sh
@@ -49,7 +49,7 @@ test_expect_success "HTTP GET empty directory" '
 '
 
 test_expect_success "HTTP PUT file to construct a hierarchy" '
-  echo "$RANDOM" >infile
+  echo "$RANDOM" >infile &&
   echo "PUT http://localhost:5002/ipfs/$HASH_EMPTY_DIR/test.txt" &&
   curl -svX PUT --data-binary @infile "http://localhost:5002/ipfs/$HASH_EMPTY_DIR/test.txt" 2>curl.out &&
   grep "HTTP/1.1 201 Created" curl.out &&
@@ -67,17 +67,15 @@ test_expect_success "We can HTTP GET file just created" '
 
 test_expect_success "HTTP PUT file to append to existing hierarchy" '
   echo "$RANDOM" >infile2 &&
-  echo "PUT http://localhost:5002${FILEPATH%/test.txt}/test/test.txt" &&
-  curl -svX PUT --data-binary @infile2 "http://localhost:5002${FILEPATH%/test.txt}/test/test.txt 2>curl.out" &&
+  URL="http://localhost:5002${FILEPATH%/test.txt}/test/test.txt" &&
+  echo "PUT $URL" &&
+  curl -svX PUT --data-binary @infile2 "$URL" 2>curl.out &&
   grep "HTTP/1.1 201 Created" curl.out &&
   grep Location curl.out
 '
 
-# TODO: this seems not to be working.
-# $FILEPATH is set to: /ipfs/QmcpPkdv1K5Rk1bT9Y4rx4FamT7ujry2C61HMzZEAuAnms/test.txt
-# $FILEPATH should be set to /ipfs/<some hash>/test/test.txt
-test_expect_failure "We can HTTP GET file just created" '
-  FILEPATH=$(grep Location curl.out | cut -d" " -f3- | tr -d "\r");
+test_expect_success "We can HTTP GET file just created" '
+  FILEPATH=$(grep Location curl.out | cut -d" " -f3- | tr -d "\r") &&
   [ "$FILEPATH" = "${FILEPATH%/test/test.txt}/test/test.txt" ] &&
   echo "GET http://localhost:5002$FILEPATH" &&
   curl -so outfile2 "http://localhost:5002$FILEPATH" &&

From 158affac993ed2c6038b65f8d3a57586e4a77415 Mon Sep 17 00:00:00 2001
From: Christian Couder <chriscool@tuxfamily.org>
Date: Sat, 28 Feb 2015 08:06:04 +0100
Subject: [PATCH 2/5] t0111: use "expr" to check Location

This makes it possible to simplify the code.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 test/sharness/t0111-gateway-writable.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/test/sharness/t0111-gateway-writable.sh b/test/sharness/t0111-gateway-writable.sh
index ca66c04e5..55293fe0a 100755
--- a/test/sharness/t0111-gateway-writable.sh
+++ b/test/sharness/t0111-gateway-writable.sh
@@ -71,17 +71,18 @@ test_expect_success "HTTP PUT file to append to existing hierarchy" '
   echo "PUT $URL" &&
   curl -svX PUT --data-binary @infile2 "$URL" 2>curl.out &&
   grep "HTTP/1.1 201 Created" curl.out &&
-  grep Location curl.out
+  LOCATION=$(grep Location curl.out) &&
+  HASH=$(expr "$LOCATION" : "< Location: /ipfs/\(.*\)/test/test.txt")
 '
 
 test_expect_success "We can HTTP GET file just created" '
-  FILEPATH=$(grep Location curl.out | cut -d" " -f3- | tr -d "\r") &&
-  [ "$FILEPATH" = "${FILEPATH%/test/test.txt}/test/test.txt" ] &&
-  echo "GET http://localhost:5002$FILEPATH" &&
-  curl -so outfile2 "http://localhost:5002$FILEPATH" &&
+  URL="http://localhost:5002/ipfs/$HASH/test/test.txt" &&
+  echo "GET $URL" &&
+  curl -so outfile2 "$URL" &&
   test_cmp infile2 outfile2 &&
-  echo "GET http://localhost:5002${FILEPATH%/test/test.txt}/test.txt" &&
-  curl -so outfile "http://localhost:5002${FILEPATH%/test/test.txt}/test.txt" &&
+  URL="http://localhost:5002/ipfs/$HASH/test.txt" &&
+  echo "GET $URL" &&
+  curl -so outfile "$URL" &&
   test_cmp infile outfile
 '
 

From d9d758cfde1f16279552ae4a518458ad2da9867b Mon Sep 17 00:00:00 2001
From: Christian Couder <chriscool@tuxfamily.org>
Date: Sat, 28 Feb 2015 08:14:15 +0100
Subject: [PATCH 3/5] t0111: use "expr" more to check Location

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 test/sharness/t0111-gateway-writable.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/sharness/t0111-gateway-writable.sh b/test/sharness/t0111-gateway-writable.sh
index 55293fe0a..e174ac094 100755
--- a/test/sharness/t0111-gateway-writable.sh
+++ b/test/sharness/t0111-gateway-writable.sh
@@ -53,21 +53,20 @@ test_expect_success "HTTP PUT file to construct a hierarchy" '
   echo "PUT http://localhost:5002/ipfs/$HASH_EMPTY_DIR/test.txt" &&
   curl -svX PUT --data-binary @infile "http://localhost:5002/ipfs/$HASH_EMPTY_DIR/test.txt" 2>curl.out &&
   grep "HTTP/1.1 201 Created" curl.out &&
-  grep Location curl.out
+  LOCATION=$(grep Location curl.out) &&
+  HASH=$(expr "$LOCATION" : "< Location: /ipfs/\(.*\)/test.txt")
 '
 
 test_expect_success "We can HTTP GET file just created" '
-  FILEPATH=$(grep Location curl.out | cut -d" " -f3- | tr -d "\r") &&
-  echo "$FILEPATH" = "${FILEPATH%/test.txt}/test.txt" &&
-  [ "$FILEPATH" = "${FILEPATH%/test.txt}/test.txt" ] &&
-  echo "GET http://localhost:5002$FILEPATH" &&
-  curl -so outfile http://localhost:5002$FILEPATH &&
+  URL="http://localhost:5002/ipfs/$HASH/test.txt" &&
+  echo "GET $URL" &&
+  curl -so outfile "$URL" &&
   test_cmp infile outfile
 '
 
 test_expect_success "HTTP PUT file to append to existing hierarchy" '
   echo "$RANDOM" >infile2 &&
-  URL="http://localhost:5002${FILEPATH%/test.txt}/test/test.txt" &&
+  URL="http://localhost:5002/ipfs/$HASH/test/test.txt" &&
   echo "PUT $URL" &&
   curl -svX PUT --data-binary @infile2 "$URL" 2>curl.out &&
   grep "HTTP/1.1 201 Created" curl.out &&

From f82526a5ca5755287bbed4aa0ed93610ca98bff8 Mon Sep 17 00:00:00 2001
From: Christian Couder <chriscool@tuxfamily.org>
Date: Sat, 28 Feb 2015 08:21:55 +0100
Subject: [PATCH 4/5] t0111: use URL variable to clarify code

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 test/sharness/t0111-gateway-writable.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/sharness/t0111-gateway-writable.sh b/test/sharness/t0111-gateway-writable.sh
index e174ac094..df4359ca8 100755
--- a/test/sharness/t0111-gateway-writable.sh
+++ b/test/sharness/t0111-gateway-writable.sh
@@ -34,8 +34,9 @@ test_expect_success "We can HTTP GET file just created" '
 '
 
 test_expect_success "HTTP PUT empty directory" '
-  echo "PUT http://localhost:5002/ipfs/$HASH_EMPTY_DIR/" &&
-  curl -svX PUT "http://localhost:5002/ipfs/$HASH_EMPTY_DIR/" 2>curl.out &&
+  URL="http://localhost:5002/ipfs/$HASH_EMPTY_DIR/" &&
+  echo "PUT $URL" &&
+  curl -svX PUT "$URL" 2>curl.out &&
   cat curl.out &&
   grep "Ipfs-Hash: $HASH_EMPTY_DIR" curl.out &&
   grep "Location: /ipfs/$HASH_EMPTY_DIR/" curl.out &&
@@ -43,15 +44,16 @@ test_expect_success "HTTP PUT empty directory" '
 '
 
 test_expect_success "HTTP GET empty directory" '
-  echo "GET http://localhost:5002/ipfs/$HASH_EMPTY_DIR/" &&
-  curl -so outfile "http://localhost:5002/ipfs/$HASH_EMPTY_DIR/" 2>curl.out &&
+  echo "GET $URL" &&
+  curl -so outfile "$URL" 2>curl.out &&
   grep "Index of /ipfs/$HASH_EMPTY_DIR/" outfile
 '
 
 test_expect_success "HTTP PUT file to construct a hierarchy" '
   echo "$RANDOM" >infile &&
-  echo "PUT http://localhost:5002/ipfs/$HASH_EMPTY_DIR/test.txt" &&
-  curl -svX PUT --data-binary @infile "http://localhost:5002/ipfs/$HASH_EMPTY_DIR/test.txt" 2>curl.out &&
+  URL="http://localhost:5002/ipfs/$HASH_EMPTY_DIR/test.txt" &&
+  echo "PUT $URL" &&
+  curl -svX PUT --data-binary @infile "$URL" 2>curl.out &&
   grep "HTTP/1.1 201 Created" curl.out &&
   LOCATION=$(grep Location curl.out) &&
   HASH=$(expr "$LOCATION" : "< Location: /ipfs/\(.*\)/test.txt")

From 17ca4f64294c5f0c1f88a82f38b43ad7e0ed9e4d Mon Sep 17 00:00:00 2001
From: Christian Couder <chriscool@tuxfamily.org>
Date: Sat, 28 Feb 2015 18:27:54 +0100
Subject: [PATCH 5/5] t0111: use expr again to check location

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 test/sharness/t0111-gateway-writable.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/sharness/t0111-gateway-writable.sh b/test/sharness/t0111-gateway-writable.sh
index df4359ca8..46a9d26b7 100755
--- a/test/sharness/t0111-gateway-writable.sh
+++ b/test/sharness/t0111-gateway-writable.sh
@@ -23,13 +23,16 @@ test_expect_success "HTTP gateway gives access to sample file" '
 
 test_expect_success "HTTP POST file gives Hash" '
   echo "$RANDOM" >infile &&
-  curl -svX POST --data-binary @infile http://localhost:5002/ipfs/ 2>curl.out &&
-  grep "HTTP/1.1 201 Created" curl.out
+  URL="http://localhost:5002/ipfs/" &&
+  curl -svX POST --data-binary @infile "$URL" 2>curl.out &&
+  grep "HTTP/1.1 201 Created" curl.out &&
+  LOCATION=$(grep Location curl.out) &&
+  HASH=$(expr "$LOCATION" : "< Location: /ipfs/\(.*\)\s")
 '
 
 test_expect_success "We can HTTP GET file just created" '
-  FILEPATH=$(grep Location curl.out | cut -d" " -f3- | tr -d "\r")
-  curl -so outfile http://localhost:5002$FILEPATH &&
+  URL="http://localhost:5002/ipfs/$HASH" &&
+  curl -so outfile "$URL" &&
   test_cmp infile outfile
 '