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] 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" &&