提交 56b6a206 作者: Juan Batiz-Benet

sharness: gateway fixes

there's an odd error setting the config.
上级 c43f539f
...@@ -118,14 +118,14 @@ test_init_ipfs() { ...@@ -118,14 +118,14 @@ test_init_ipfs() {
test_config_ipfs_gateway_readonly() { test_config_ipfs_gateway_readonly() {
test_expect_success "prepare config -- gateway readonly" ' test_expect_success "prepare config -- gateway readonly" '
ipfs config Addresses.Gateway /ip4/0.0.0.0/tcp/5002 ipfs config "Addresses.Gateway" "/ip4/0.0.0.0/tcp/5002"
' '
} }
test_config_ipfs_gateway_writable() { test_config_ipfs_gateway_writable() {
test_expect_success "prepare config -- gateway writable" ' test_expect_success "prepare config -- gateway writable" '
ipfs config Addresses.Gateway /ip4/0.0.0.0/tcp/5002 && ipfs config "Addresses.Gateway" "/ip4/0.0.0.0/tcp/5002" &&
ipfs config -bool Gateway.Writable true ipfs config -bool "Gateway.Writable" true
' '
} }
...@@ -146,22 +146,23 @@ test_launch_ipfs_daemon() { ...@@ -146,22 +146,23 @@ test_launch_ipfs_daemon() {
# and we make sure there are no errors # and we make sure there are no errors
test_expect_success "'ipfs daemon' is ready" ' test_expect_success "'ipfs daemon' is ready" '
IPFS_PID=$! && IPFS_PID=$! &&
test_wait_output_n_lines_60_sec actual_daemon $NLINES && test_wait_output_n_lines_60_sec actual_daemon $NLINES ||
printf "" >empty && test_cmp daemon_err empty ||
fsh cat actual_daemon || fsh cat daemon_err fsh cat actual_daemon || fsh cat daemon_err
' '
test_expect_success "'ipfs daemon' output includes API address" ' test_expect_success "'ipfs daemon' output includes API address" '
cat actual_daemon | grep "API server listening on $ADDR_API" || cat actual_daemon | grep "API server listening on $ADDR_API" ||
fsh cat actual_daemon || fsh cat actual_daemon ||
fsh "cat actual_daemon | grep \"API server listening on $ADDR_API\"" fsh "cat actual_daemon | grep \"API server listening on $ADDR_API\"" ||
fsh cat daemon_err
' '
if test "$ADDR_GWAY" != ""; then if test "$ADDR_GWAY" != ""; then
test_expect_success "'ipfs daemon' output includes Gateway address" ' test_expect_success "'ipfs daemon' output includes Gateway address" '
cat actual_daemon | grep "Gateway server listening on $ADDR_GWAY" || cat actual_daemon | grep "Gateway server listening on $ADDR_GWAY" ||
fsh cat actual_daemon || fsh cat actual_daemon ||
fsh "cat actual_daemon | grep \"Gateway server listening on $ADDR_GWAY\"" fsh "cat actual_daemon | grep \"Gateway server listening on $ADDR_GWAY\"" ||
fsh cat daemon_err
' '
fi fi
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# MIT Licensed; see the LICENSE file in this repository. # MIT Licensed; see the LICENSE file in this repository.
# #
test_description="Test HTTP gateway" test_description="Test HTTP Gateway"
. lib/test-lib.sh . lib/test-lib.sh
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# MIT Licensed; see the LICENSE file in this repository. # MIT Licensed; see the LICENSE file in this repository.
# #
test_description="Test HTTP Gateway" test_description="Test HTTP Gateway (Writable)"
. lib/test-lib.sh . lib/test-lib.sh
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论