fixing tests

Author: guillaumemichel

cmd/ipfs/kubo/daemon.go

@@ -485,6 +485,10 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
 		// This should never happen, but better safe than sorry
 		log.Fatal("Private network does not work with Routing.Type=auto. Update your config to Routing.Type=dht (or none, and do manual peering)")
 	}
+	if cfg.Provider.Strategy != "" && cfg.Reprovider.Strategy.IsDefault() {
+		// Provider.Strategy isn't used anywhere.
+		log.Fatal("Switch to using Reprovider.Strategy instead of Provider.Strategy. Update your config to remove this message.")
+	}
 
 	printLibp2pPorts(node)
 

config/config_test.go

@@ -134,9 +134,9 @@ func TestCheckKey(t *testing.T) {
 		t.Fatal("Foo.Bar isn't a valid key in the config")
 	}
 
-	err = CheckKey("Provider.Strategy")
+	err = CheckKey("Reprovider.Strategy")
 	if err != nil {
-		t.Fatalf("%s: %s", err, "Provider.Strategy is a valid key in the config")
+		t.Fatalf("%s: %s", err, "Reprovider.Strategy is a valid key in the config")
 	}
 
 	err = CheckKey("Provider.Foo")

core/commands/commands_test.go

@@ -184,6 +184,7 @@ func TestCommands(t *testing.T) {
 		"/stats/bw",
 		"/stats/dht",
 		"/stats/provide",
+		"/stats/reprovide",
 		"/stats/repo",
 		"/swarm",
 		"/swarm/addrs",

core/commands/stat_provide.go

@@ -13,10 +13,11 @@ import (
 var statProvideCmd = &cmds.Command{
 	Status: cmds.Deprecated,
 	Helptext: cmds.HelpText{
-		Tagline: "Deprecated command to get provider+reprovider statistics. Use 'ipfs stats reprovide' instead.",
+		Tagline: "Deprecated command, use 'ipfs stats reprovide' instead.",
 		ShortDescription: `
-'ipfs stats provide' is depreacted because provide and reprovide operations are now distinct.
-This command may be replaced by provide only stats in the future.
+'ipfs stats provide' is depreacted because provide and reprovide operations are
+now distinct. This command may be replaced by provide only stats in the
+future.
 `,
 	},
 	Arguments: []cmds.Argument{},

test/sharness/t0002-docker-image.sh

@@ -36,7 +36,7 @@ test_expect_success "docker image build succeeds" '
 '
 
 test_expect_success "write init scripts" '
-  echo "ipfs config Provider.Strategy Bar" > 001.sh &&
+  echo "ipfs config Reprovider.Strategy Bar" > 001.sh &&
   echo "ipfs config Pubsub.Router Qux" > 002.sh &&
   chmod +x 002.sh
 '
@@ -65,7 +65,7 @@ test_expect_success "check that init scripts were run correctly and in the corre
 
 test_expect_success "check that init script configs were applied" '
   echo Bar > expected &&
-  docker exec "$DOC_ID" ipfs config Provider.Strategy > actual &&
+  docker exec "$DOC_ID" ipfs config Reprovider.Strategy > actual &&
   test_cmp actual expected &&
   echo Qux > expected &&
   docker exec "$DOC_ID" ipfs config Pubsub.Router > actual &&

test/sharness/t0070-user-config.sh

@@ -11,12 +11,12 @@ test_description="Test user-provided config values"
 test_init_ipfs
 
 test_expect_success "bootstrap doesn't overwrite user-provided config keys (top-level)" '
-  ipfs config Provider.Strategy >previous &&
-  ipfs config Provider.Strategy foo &&
+  ipfs config Reprovider.Strategy >previous &&
+  ipfs config Reprovider.Strategy foo &&
   ipfs bootstrap rm --all &&
   echo "foo" >expected &&
-  ipfs config Provider.Strategy >actual &&
-  ipfs config Provider.Strategy $(cat previous) &&
+  ipfs config Reprovider.Strategy >actual &&
+  ipfs config Reprovider.Strategy $(cat previous) &&
   test_cmp expected actual
 '