Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix loops in sharness tests to fail the test if the inner command fails #4482

Merged
merged 5 commits into from
Dec 16, 2017
Merged

fix loops in sharness tests to fail the test if the inner command fails #4482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d7231d
fix loops in sharness tests to fail the test if the inner command fails
Stebalien Dec 13, 2017
cb5dae0
version, get, resolve, and dht have been allowed
Stebalien Dec 13, 2017
958add6
patch should not have been allowed
Stebalien Dec 13, 2017
cccd03e
sharness: print gateway command that should be sanitized
Stebalien Dec 15, 2017
6bd524f
correctly test refs local
Stebalien Dec 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ var rootROOldSubcommands = map[string]*oldcmds.Command{
"links": ocmd.ObjectLinksCmd,
"get": ocmd.ObjectGetCmd,
"stat": ocmd.ObjectStatCmd,
"patch": ocmd.ObjectPatchCmd,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@whyrusleeping ^^

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

},
},
"dag": &oldcmds.Command{
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0082-repo-gc-auto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ test_gc() {
test_expect_success "periodic auto gc stress test" '
for i in $(test_seq 1 20)
do
test_gc
test_gc || return 1
done
'

Expand Down
35 changes: 31 additions & 4 deletions test/sharness/t0110-gateway.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,38 @@ test_expect_success "refs IPFS directory file through readonly API succeeds" '
test_curl_gateway_api "refs?arg=$HASH2/test"
'

test_expect_success "test gateway api is sanitized" '
for cmd in "add" "block/put" "bootstrap" "config" "dht" "diag" "dns" "get" "id" "mount" "name/publish" "object/put" "object/new" "object/patch" "pin" "ping" "refs/local" "repo" "resolve" "stats" "swarm" "file" "update" "version" "bitswap"; do
for cmd in add \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed get, version, resolve, and dns as these are now exposed on the gateway.

block/put \
bootstrap \
config \
dht \
diag \
id \
mount \
name/publish \
object/put \
object/new \
object/patch \
pin \
ping \
repo \
stats \
swarm \
file \
update \
bitswap
do
test_expect_success "test gateway api is sanitized: $cmd" '
test_curl_resp_http_code "http://127.0.0.1:$port/api/v0/$cmd" "HTTP/1.1 404 Not Found"
done
'
'
done

# This one is different. `local` will be interpreted as a path if the command isn't defined.
test_expect_success "test gateway api is sanitized: refs/local" '
echo "Error: invalid '"'ipfs ref'"' path" > refs_local_expected &&
! ipfs --api /ip4/127.0.0.1/tcp/$port refs local > refs_local_actual 2>&1 &&
test_cmp refs_local_expected refs_local_actual
'

test_expect_success "create raw-leaves node" '
echo "This is RAW!" > rfile &&
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0250-files-api.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ test_sharding() {
printf "" > list_exp_raw
for i in `seq 100`
do
echo $i | ipfs files write --create /foo/file$i
echo $i | ipfs files write --create /foo/file$i || return 1
echo file$i >> list_exp_raw
done
'
Expand Down