Skip to content

Commit

Permalink
propagate test_launch_ipfs_daemon_without_network name
Browse files Browse the repository at this point in the history
  • Loading branch information
schomatis committed Jul 8, 2021
1 parent 61f58c2 commit 9561068
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion test/sharness/t0023-shutdown.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ test_expect_success "daemon no longer running" '
done
'

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_expect_success "shutdown succeeds" '
ipfs shutdown
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0040-add-and-cat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ test_add_named_pipe
test_add_pwd_is_symlink

# Test daemon in offline mode
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_add_cat_file

Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0045-ls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ test_expect_success "'ipfs ls --resolve-type=true --size=false' fails" '
test_must_fail ipfs ls --resolve-type=true --size=false $DIR
'

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_expect_success "'ipfs ls --resolve-type=false --size=false' ok" '
ipfs ls --resolve-type=false --size=false $DIR > /dev/null
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0061-daemon-opts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ test_expect_success SOCAT 'transport should be unencrypted ( needs socat )' '

test_kill_ipfs_daemon

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

gwyaddr=$GWAY_ADDR
apiaddr=$API_ADDR
Expand Down
4 changes: 2 additions & 2 deletions test/sharness/t0080-repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ test_description="Test ipfs repo operations"
. lib/test-lib.sh

test_init_ipfs
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_expect_success "'ipfs repo gc' succeeds" '
ipfs repo gc >gc_out_actual
Expand Down Expand Up @@ -63,7 +63,7 @@ test_expect_success "ipfs repo gc fully reverse ipfs add (part 2)" '
test_cmp expected_blocks actual_blocks
'

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_expect_success "file no longer pinned" '
ipfs pin ls --type=recursive --quiet >actual2 &&
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0081-repo-pinning.sh
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ test_expect_success "some are no longer there" '
test_must_fail ipfs ls "$HASH_DIR3"
'

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network
test_expect_success "recursive pin fails without objects" '
test_must_fail ipfs pin add -r "$HASH_DIR1" 2>err_expected8 &&
grep "pin: merkledag: not found" err_expected8 ||
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0085-pins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ test_pin_dag --raw-leaves

test_pin_progress

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_pins '' '' ''
test_pins --progress '' ''
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0087-repo-robust-gc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ test_init_ipfs
test_gc_robust_part1
test_gc_robust_part2

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_gc_robust_part1
test_gc_robust_part2
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0095-refs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ test_description="Test 'ipfs refs' command"
. lib/test-lib.sh

test_init_ipfs
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

# This file performs tests with the following directory
# structure.
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0100-name.sh
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ test_name_with_self() {
test_kill_ipfs_daemon

# Test daemon in offline mode
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_expect_success "'ipfs name publish' fails offline mode" '
test_expect_code 1 ipfs name publish "/ipfs/$HASH_WELCOME_DOCS"
Expand Down
18 changes: 9 additions & 9 deletions test/sharness/t0114-gateway-subdomains.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ test_expect_success "ipfs init" '
ipfs init --profile=test > /dev/null
'

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

# CIDv0to1 is necessary because raw-leaves are enabled by default during
# "ipfs add" with CIDv1 and disabled with CIDv0
Expand Down Expand Up @@ -141,7 +141,7 @@ test_expect_success "Publish test text file to IPNS using ED25519 keys" '
test_expect_success 'start daemon with empty config for Gateway.PublicGateways' '
test_kill_ipfs_daemon &&
ipfs config --json Gateway.PublicGateways "{}" &&
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network
'

## ============================================================================
Expand Down Expand Up @@ -337,7 +337,7 @@ ipfs config --json Gateway.PublicGateways '{
}' || exit 1
# restart daemon to apply config changes
test_kill_ipfs_daemon
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network


# example.com/ip(f|n)s/*
Expand Down Expand Up @@ -519,7 +519,7 @@ ipfs config --json Gateway.PublicGateways '{
}' || exit 1
# restart daemon to apply config changes
test_kill_ipfs_daemon
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

# not mounted at the root domain
test_hostname_gateway_response_should_contain \
Expand Down Expand Up @@ -632,7 +632,7 @@ ipfs config --json Gateway.PublicGateways '{
}' || exit 1
# restart daemon to apply config changes
test_kill_ipfs_daemon
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

# refuse requests to Paths that were not explicitly whitelisted for the hostname
test_hostname_gateway_response_should_contain \
Expand Down Expand Up @@ -661,7 +661,7 @@ ipfs config --json Gateway.PublicGateways '{

# restart daemon to apply config changes
test_kill_ipfs_daemon
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

# example.com/ip(f|n)s/* smoke-tests
# =============================================================================
Expand Down Expand Up @@ -834,7 +834,7 @@ ipfs config --json Gateway.PublicGateways '{
}' || exit 1
# restart daemon to apply config changes
test_kill_ipfs_daemon
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_expect_success "request for http://fake.domain.com/ipfs/{CID} doesn't match the example.com gateway" "
curl -H \"Host: fake.domain.com\" -sD - \"http://127.0.0.1:$GWAY_PORT/ipfs/$CIDv1\" > response &&
Expand Down Expand Up @@ -876,7 +876,7 @@ ipfs config --json Gateway.PublicGateways '{
}' || exit 1
# restart daemon to apply config changes
test_kill_ipfs_daemon
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

# *.example1.com

Expand Down Expand Up @@ -945,7 +945,7 @@ ipfs config --json Gateway.PublicGateways '{

# restart daemon to apply config changes
test_kill_ipfs_daemon
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_localhost_gateway_response_should_contain \
"request for localhost/ipfs/{CID} stays on path when subdomain gw is explicitly disabled" \
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0115-gateway-dir-listing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test_expect_success "ipfs init" '
ipfs init --profile=test > /dev/null
'

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_expect_success "Add the test directory" '
mkdir -p rootDir/ipfs &&
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0250-files-api.sh
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ test_expect_success "enable sharding in config" '
ipfs config --json Experimental.ShardingEnabled true
'

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

SHARD_HASH=QmPkwLJTYZRGPJ8Lazr9qPdrLmswPtUjaDbEpmR9jEh1se
test_sharding "(cidv0)"
Expand Down
4 changes: 2 additions & 2 deletions test/sharness/t0271-filestore-utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ test_init

# must be in offline mode so tests that retrieve non-existent blocks
# doesn't hang
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_filestore_adds

Expand Down Expand Up @@ -251,7 +251,7 @@ test_init

# must be in offline mode so tests that retrieve non-existent blocks
# doesn't hang
test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_filestore_adds

Expand Down
4 changes: 2 additions & 2 deletions test/sharness/t0272-urlstore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ test_urlstore() {
HASH3a=$(ipfs add -q --trickle --raw-leaves=false file3)
'

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_expect_success "make sure files can be retrieved via the gateway" '
curl http://127.0.0.1:$GWAY_PORT/ipfs/$HASH1a -o file1.actual &&
Expand All @@ -48,7 +48,7 @@ test_urlstore() {
ipfs config --json Experimental.UrlstoreEnabled true
'

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_expect_success "add files using gateway address via url store using $ADD_CMD" '
HASH1=$(ipfs $ADD_CMD --pin=false http://127.0.0.1:$GWAY_PORT/ipfs/$HASH1a) &&
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0600-issues-and-regressions-online.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ test_expect_success "ipfs daemon --offline --mount fails - #2995" '
test_fsh cat daemon_err
'

test_launch_ipfs_daemon --offline
test_launch_ipfs_daemon_without_network

test_expect_success "'ipfs name resolve' succeeds after ipfs id when daemon offline" '
PEERID=`ipfs key list --ipns-base=base36 -l | grep self | cut -d " " -f1` &&
Expand Down

0 comments on commit 9561068

Please sign in to comment.