Add test cases for ipfs api check

rht · rht · commit 1a008134260f · 2015-08-27T16:51:18.000+07:00
License: MIT
Signed-off-by: rht &lt;rhtbot@gmail.com&gt;
diff --git a/test/sharness/README.md b/test/sharness/README.md
@@ -71,7 +71,9 @@ For example:
 test_expect_success ".ipfs/ has been created" '
   test -d ".ipfs" &&
   test -f ".ipfs/config" &&
-  test -d ".ipfs/datastore" ||
+  test -f ".ipfs/api" &&
+  test -d ".ipfs/datastore" &&
+  test -d ".ipfs/blocks" ||
   test_fsh ls -al .ipfs
 '
 ```
diff --git a/test/sharness/t0020-init.sh b/test/sharness/t0020-init.sh
@@ -47,6 +47,7 @@ test_expect_success "ipfs init succeeds" '
 test_expect_success ".ipfs/ has been created" '
 	test -d ".ipfs" &&
 	test -f ".ipfs/config" &&
+	test -f ".ipfs/api" &&
 	test -d ".ipfs/datastore" &&
 	test -d ".ipfs/blocks" ||
 	test_fsh ls -al .ipfs
diff --git a/test/sharness/t0060-daemon.sh b/test/sharness/t0060-daemon.sh
@@ -75,8 +75,10 @@ test_expect_success "ipfs daemon output looks good" '
 test_expect_success ".ipfs/ has been created" '
   test -d ".ipfs" &&
   test -f ".ipfs/config" &&
-  test -d ".ipfs/datastore" ||
-  test_fsh ls .ipfs
+  test -f ".ipfs/api" &&
+  test -d ".ipfs/datastore" &&
+  test -d ".ipfs/blocks" ||
+  test_fsh ls -al .ipfs
 '
 
 # begin same as in t0010
@@ -102,13 +104,20 @@ test_expect_success "ipfs help output looks good" '
 
 # check transport is encrypted
 
-test_expect_success 'transport should be encrypted' '
+test_expect_success "transport should be encrypted" '
   nc -w 5 localhost 4001 >swarmnc &&
   grep -q "AES-256,AES-128" swarmnc &&
   test_must_fail grep -q "/ipfs/identify" swarmnc ||
 	test_fsh cat swarmnc
 '
 
+test_expect_success "client should err if api is off but daemon is on" '
+  echo "Error: api not running" >expected &&
+  echo "off" > $IPFS_PATH/api &&
+  test_must_fail ipfs --api "/ip4/127.0.0.1/tcp/5001" id 2>actual &&
+  test_cmp expected actual
+'
+
 # end same as in t0010
 
 test_expect_success "daemon is still running" '
@@ -119,6 +128,11 @@ test_expect_success "'ipfs daemon' can be killed" '
   test_kill_repeat_10_sec $IPFS_PID
 '
 
+test_expect_success "client should work if api is on but daemon is off" '
+  echo "/ip4/127.0.0.1/tcp/5003" > $IPFS_PATH/api &&
+  ipfs --api "/ip4/127.0.0.1/tcp/5003" id
+'
+
 test_expect_success "'ipfs daemon' should be able to run with a pipe attached to stdin (issue #861)" '
   yes | ipfs daemon --init >stdin_daemon_out 2>stdin_daemon_err &
   pollEndpoint -ep=/version -v -tout=1s -tries=10 >stdin_poll_apiout 2>stdin_poll_apierr &&
