Skip importing from external tools in non-import tests

golang · Jun 1, 2017 · 6f7a9d3 · 6f7a9d3
1 parent cbc263f
commit 6f7a9d3
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/cmd/dep/root_analyzer.go b/cmd/dep/root_analyzer.go
@@ -136,8 +136,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 {
   "commands": [
-    ["init", "project_dir"]
+    ["init", "-skip-tools", "project_dir"]
   ],
+  "error-expected": "",
   "init-path": "project_dir"
-
 }