From b9d8969fcd297b97859c1f8d841cfff1c83b9e37 Mon Sep 17 00:00:00 2001
From: Michael Gokhman <michael.gokhman@yahoo.com>
Date: Fri, 15 Sep 2017 13:29:45 +0300
Subject: [PATCH] add gvt importer integration test and update docs

---
 cmd/dep/init.go                               |  2 +-
 .../init/gvt/case1/final/Gopkg.lock           | 21 +++++++++++++++++++
 .../init/gvt/case1/final/Gopkg.toml           |  3 +++
 .../init/gvt/case1/initial/main.go            | 16 ++++++++++++++
 .../init/gvt/case1/initial/vendor/manifest    | 17 +++++++++++++++
 .../init/gvt/case1/testcase.json              | 13 ++++++++++++
 docs/FAQ.md                                   |  2 +-
 7 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.lock
 create mode 100644 cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.toml
 create mode 100644 cmd/dep/testdata/harness_tests/init/gvt/case1/initial/main.go
 create mode 100644 cmd/dep/testdata/harness_tests/init/gvt/case1/initial/vendor/manifest
 create mode 100644 cmd/dep/testdata/harness_tests/init/gvt/case1/testcase.json

diff --git a/cmd/dep/init.go b/cmd/dep/init.go
index 7fef07f4ec..cb4f21b10f 100644
--- a/cmd/dep/init.go
+++ b/cmd/dep/init.go
@@ -29,7 +29,7 @@ specified, use the current directory.
 When configuration for another dependency management tool is detected, it is
 imported into the initial manifest and lock. Use the -skip-tools flag to
 disable this behavior. The following external tools are supported:
-glide, godep, vndr, govend.
+glide, godep, vndr, govend, gvt.
 
 Any dependencies that are not constrained by external configuration use the
 GOPATH analysis below.
diff --git a/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.lock b/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.lock
new file mode 100644
index 0000000000..74c44abc9d
--- /dev/null
+++ b/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.lock
@@ -0,0 +1,21 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/sdboyer/deptest"
+  packages = ["."]
+  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
+  version = "v0.8.1"
+
+[[projects]]
+  name = "github.com/sdboyer/deptestdos"
+  packages = ["."]
+  revision = "5c607206be5decd28e6263ffffdcee067266015e"
+  version = "v2.0.0"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "1caabc68a242bf012bf5e10e30d21e342beb7e338707a6fd08f0398c18548e32"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.toml b/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.toml
new file mode 100644
index 0000000000..898e622122
--- /dev/null
+++ b/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.toml
@@ -0,0 +1,3 @@
+
+[[constraint]]
+  name = "github.com/sdboyer/deptestdos"
diff --git a/cmd/dep/testdata/harness_tests/init/gvt/case1/initial/main.go b/cmd/dep/testdata/harness_tests/init/gvt/case1/initial/main.go
new file mode 100644
index 0000000000..2b2c7c396e
--- /dev/null
+++ b/cmd/dep/testdata/harness_tests/init/gvt/case1/initial/main.go
@@ -0,0 +1,16 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/sdboyer/deptestdos"
+)
+
+func main() {
+	var x deptestdos.Bar
+	fmt.Println(x)
+}
diff --git a/cmd/dep/testdata/harness_tests/init/gvt/case1/initial/vendor/manifest b/cmd/dep/testdata/harness_tests/init/gvt/case1/initial/vendor/manifest
new file mode 100644
index 0000000000..2d30d3732d
--- /dev/null
+++ b/cmd/dep/testdata/harness_tests/init/gvt/case1/initial/vendor/manifest
@@ -0,0 +1,17 @@
+{
+  "version": "0",
+  "dependencies": [
+    {
+      "importpath": "github.com/sdboyer/deptest",
+      "repository": "https://github.com/sdboyer/deptest",
+      "revision": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
+      "branch": "master"
+    },
+    {
+      "importpath": "github.com/sdboyer/deptestdos",
+      "repository": "https://github.com/sdboyer/deptestdos",
+      "revision": "5c607206be5decd28e6263ffffdcee067266015eXXX",
+      "branch": "master"
+    }
+  ]
+}
diff --git a/cmd/dep/testdata/harness_tests/init/gvt/case1/testcase.json b/cmd/dep/testdata/harness_tests/init/gvt/case1/testcase.json
new file mode 100644
index 0000000000..017dc4cd55
--- /dev/null
+++ b/cmd/dep/testdata/harness_tests/init/gvt/case1/testcase.json
@@ -0,0 +1,13 @@
+{
+  "commands": [
+    ["init", "-no-examples"]
+  ],
+  "error-expected": "",
+  "gopath-initial": {
+    "github.com/sdboyer/deptest": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
+  },
+  "vendor-final": [
+    "github.com/sdboyer/deptest",
+    "github.com/sdboyer/deptestdos"
+  ]
+}
diff --git a/docs/FAQ.md b/docs/FAQ.md
index bc202b1296..13bae796b6 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -209,7 +209,7 @@ about what's going on.
 During `dep init` configuration from other dependency managers is detected
 and imported, unless `-skip-tools` is specified.
 
-The following tools are supported: `glide`, `godep`, `vndr` and `govend`.
+The following tools are supported: `glide`, `godep`, `vndr`, `govend` and `gvt`.
 
 See [#186](https://github.com/golang/dep/issues/186#issuecomment-306363441) for
 how to add support for another tool.