diff --git a/cmd/dep/root_analyzer.go b/cmd/dep/root_analyzer.go index 84ec5638bf..d1335fd48a 100644 --- a/cmd/dep/root_analyzer.go +++ b/cmd/dep/root_analyzer.go @@ -132,8 +132,7 @@ func (a *rootAnalyzer) Info() (string, int) { name := "dep" version := 1 if !a.skipTools { - // TODO(carolynvs): Before merging this PR #500, uncomment and update testdata memos - //name = "dep+import" + name = "dep+import" } return name, version } diff --git a/cmd/dep/testdata/harness_tests/ensure/empty/case1/testcase.json b/cmd/dep/testdata/harness_tests/ensure/empty/case1/testcase.json index ba9b088aa5..620bc4e060 100644 --- a/cmd/dep/testdata/harness_tests/ensure/empty/case1/testcase.json +++ b/cmd/dep/testdata/harness_tests/ensure/empty/case1/testcase.json @@ -1,6 +1,6 @@ { "commands": [ - ["init"], + ["init", "-skip-tools"], ["ensure", "-update"] ], "error-expected": "", diff --git a/cmd/dep/testdata/harness_tests/ensure/override/case1/testcase.json b/cmd/dep/testdata/harness_tests/ensure/override/case1/testcase.json index 4f1ce1d26b..72e29594ac 100644 --- a/cmd/dep/testdata/harness_tests/ensure/override/case1/testcase.json +++ b/cmd/dep/testdata/harness_tests/ensure/override/case1/testcase.json @@ -1,6 +1,6 @@ { "commands": [ - ["init"], + ["init", "-skip-tools"], ["ensure", "-override", "github.com/sdboyer/deptest@=1.0.0"] ], "error-expected": "", diff --git a/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/testcase.json b/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/testcase.json index 111c48e755..2ccd4f9041 100644 --- a/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/testcase.json +++ b/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/testcase.json @@ -1,6 +1,6 @@ { "commands": [ - ["init", "-no-examples"], + ["init", "-no-examples", "-skip-tools"], ["ensure", "-update"] ], "error-expected": "all dirs lacked any go code", diff --git a/cmd/dep/testdata/harness_tests/init/case1/testcase.json b/cmd/dep/testdata/harness_tests/init/case1/testcase.json index d1d4585460..d2403484b7 100644 --- a/cmd/dep/testdata/harness_tests/init/case1/testcase.json +++ b/cmd/dep/testdata/harness_tests/init/case1/testcase.json @@ -1,6 +1,6 @@ { "commands": [ - ["init", "-no-examples"] + ["init", "-no-examples", "-skip-tools"] ], "error-expected": "", "gopath-initial": { diff --git a/cmd/dep/testdata/harness_tests/init/case2/testcase.json b/cmd/dep/testdata/harness_tests/init/case2/testcase.json index e16b746d4b..9167534f7b 100644 --- a/cmd/dep/testdata/harness_tests/init/case2/testcase.json +++ b/cmd/dep/testdata/harness_tests/init/case2/testcase.json @@ -1,6 +1,6 @@ { "commands": [ - ["init", "-no-examples"] + ["init", "-no-examples", "-skip-tools"] ], "error-expected": "", "gopath-initial": { diff --git a/cmd/dep/testdata/harness_tests/init/case3/testcase.json b/cmd/dep/testdata/harness_tests/init/case3/testcase.json index d3a92a55e2..d50e7d91cb 100644 --- a/cmd/dep/testdata/harness_tests/init/case3/testcase.json +++ b/cmd/dep/testdata/harness_tests/init/case3/testcase.json @@ -1,6 +1,6 @@ { "commands": [ - ["init", "-no-examples"] + ["init", "-no-examples", "-skip-tools"] ], "error-expected": "", "gopath-initial": { diff --git a/cmd/dep/testdata/harness_tests/init/skip-hidden/testcase.json b/cmd/dep/testdata/harness_tests/init/skip-hidden/testcase.json index 5e4c2bb85d..0283a8839f 100644 --- a/cmd/dep/testdata/harness_tests/init/skip-hidden/testcase.json +++ b/cmd/dep/testdata/harness_tests/init/skip-hidden/testcase.json @@ -1,6 +1,6 @@ { "commands": [ - ["init", "-no-examples"] + ["init", "-no-examples", "-skip-tools"] ], "error-expected": "", "vendor-final": [ diff --git a/cmd/dep/testdata/init_path_tests/relative_path/testcase.json b/cmd/dep/testdata/init_path_tests/relative_path/testcase.json index e32eeb9e0b..6fa477b508 100644 --- a/cmd/dep/testdata/init_path_tests/relative_path/testcase.json +++ b/cmd/dep/testdata/init_path_tests/relative_path/testcase.json @@ -1,7 +1,7 @@ { "commands": [ - ["init", "project_dir"] + ["init", "-skip-tools", "project_dir"] ], + "error-expected": "", "init-path": "project_dir" - }