From 9561068548f26ed49270e574a063f08b7bf1526c Mon Sep 17 00:00:00 2001 From: Lucas Molas Date: Thu, 8 Jul 2021 16:18:42 -0300 Subject: [PATCH] propagate test_launch_ipfs_daemon_without_network name --- test/sharness/t0023-shutdown.sh | 2 +- test/sharness/t0040-add-and-cat.sh | 2 +- test/sharness/t0045-ls.sh | 2 +- test/sharness/t0061-daemon-opts.sh | 2 +- test/sharness/t0080-repo.sh | 4 ++-- test/sharness/t0081-repo-pinning.sh | 2 +- test/sharness/t0085-pins.sh | 2 +- test/sharness/t0087-repo-robust-gc.sh | 2 +- test/sharness/t0095-refs.sh | 2 +- test/sharness/t0100-name.sh | 2 +- test/sharness/t0114-gateway-subdomains.sh | 18 +++++++++--------- test/sharness/t0115-gateway-dir-listing.sh | 2 +- test/sharness/t0250-files-api.sh | 2 +- test/sharness/t0271-filestore-utils.sh | 4 ++-- test/sharness/t0272-urlstore.sh | 4 ++-- .../t0600-issues-and-regressions-online.sh | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/test/sharness/t0023-shutdown.sh b/test/sharness/t0023-shutdown.sh index 960e89db9b4..33a0ca3f16f 100755 --- a/test/sharness/t0023-shutdown.sh +++ b/test/sharness/t0023-shutdown.sh @@ -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 diff --git a/test/sharness/t0040-add-and-cat.sh b/test/sharness/t0040-add-and-cat.sh index 365626bb76e..8e8386db4e2 100755 --- a/test/sharness/t0040-add-and-cat.sh +++ b/test/sharness/t0040-add-and-cat.sh @@ -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 diff --git a/test/sharness/t0045-ls.sh b/test/sharness/t0045-ls.sh index a090b0ac657..381c9d23cb4 100755 --- a/test/sharness/t0045-ls.sh +++ b/test/sharness/t0045-ls.sh @@ -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 diff --git a/test/sharness/t0061-daemon-opts.sh b/test/sharness/t0061-daemon-opts.sh index 9d60852c845..108fe75abce 100755 --- a/test/sharness/t0061-daemon-opts.sh +++ b/test/sharness/t0061-daemon-opts.sh @@ -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 diff --git a/test/sharness/t0080-repo.sh b/test/sharness/t0080-repo.sh index 4e0d4800f72..ffb846603e5 100755 --- a/test/sharness/t0080-repo.sh +++ b/test/sharness/t0080-repo.sh @@ -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 @@ -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 && diff --git a/test/sharness/t0081-repo-pinning.sh b/test/sharness/t0081-repo-pinning.sh index 9f1d3c85e20..06a4e6a4595 100755 --- a/test/sharness/t0081-repo-pinning.sh +++ b/test/sharness/t0081-repo-pinning.sh @@ -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 || diff --git a/test/sharness/t0085-pins.sh b/test/sharness/t0085-pins.sh index e05f7dedbbd..90f3b0d8acd 100755 --- a/test/sharness/t0085-pins.sh +++ b/test/sharness/t0085-pins.sh @@ -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 '' '' diff --git a/test/sharness/t0087-repo-robust-gc.sh b/test/sharness/t0087-repo-robust-gc.sh index 6da96af6c44..2de1bf56509 100755 --- a/test/sharness/t0087-repo-robust-gc.sh +++ b/test/sharness/t0087-repo-robust-gc.sh @@ -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 diff --git a/test/sharness/t0095-refs.sh b/test/sharness/t0095-refs.sh index 99dc361c79c..ca84bb6ad07 100755 --- a/test/sharness/t0095-refs.sh +++ b/test/sharness/t0095-refs.sh @@ -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. diff --git a/test/sharness/t0100-name.sh b/test/sharness/t0100-name.sh index df55731e9bf..934cc012740 100755 --- a/test/sharness/t0100-name.sh +++ b/test/sharness/t0100-name.sh @@ -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" diff --git a/test/sharness/t0114-gateway-subdomains.sh b/test/sharness/t0114-gateway-subdomains.sh index 0cf4d57ae92..41abd4a8774 100755 --- a/test/sharness/t0114-gateway-subdomains.sh +++ b/test/sharness/t0114-gateway-subdomains.sh @@ -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 @@ -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 ' ## ============================================================================ @@ -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/* @@ -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 \ @@ -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 \ @@ -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 # ============================================================================= @@ -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 && @@ -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 @@ -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" \ diff --git a/test/sharness/t0115-gateway-dir-listing.sh b/test/sharness/t0115-gateway-dir-listing.sh index d7808a261a9..561604fef79 100755 --- a/test/sharness/t0115-gateway-dir-listing.sh +++ b/test/sharness/t0115-gateway-dir-listing.sh @@ -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 && diff --git a/test/sharness/t0250-files-api.sh b/test/sharness/t0250-files-api.sh index e606c9c0446..7d6c85dc984 100755 --- a/test/sharness/t0250-files-api.sh +++ b/test/sharness/t0250-files-api.sh @@ -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)" diff --git a/test/sharness/t0271-filestore-utils.sh b/test/sharness/t0271-filestore-utils.sh index 058ff5d1367..387a8417f8a 100755 --- a/test/sharness/t0271-filestore-utils.sh +++ b/test/sharness/t0271-filestore-utils.sh @@ -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 @@ -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 diff --git a/test/sharness/t0272-urlstore.sh b/test/sharness/t0272-urlstore.sh index a2c4867f659..d22c82dd3ba 100755 --- a/test/sharness/t0272-urlstore.sh +++ b/test/sharness/t0272-urlstore.sh @@ -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 && @@ -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) && diff --git a/test/sharness/t0600-issues-and-regressions-online.sh b/test/sharness/t0600-issues-and-regressions-online.sh index 93f51caeecb..315a9d1172e 100755 --- a/test/sharness/t0600-issues-and-regressions-online.sh +++ b/test/sharness/t0600-issues-and-regressions-online.sh @@ -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` &&