Test glide import for branch with semver name

cmd/dep/glide_importer_test.go

@@ -44,8 +44,8 @@ func TestGlideConfig_Import(t *testing.T) {
 	defer sm.Release()
 
 	h.TempDir(filepath.Join("src", testGlideProjectRoot))
-	h.TempCopy(filepath.Join(testGlideProjectRoot, glideYamlName), "glide/glide.yaml")
-	h.TempCopy(filepath.Join(testGlideProjectRoot, glideLockName), "glide/glide.lock")
+	h.TempCopy(filepath.Join(testGlideProjectRoot, glideYamlName), "glide/glide0.yaml")
+	h.TempCopy(filepath.Join(testGlideProjectRoot, glideLockName), "glide/glide0.lock")
 	projectRoot := h.Path(testGlideProjectRoot)
 
 	// Capture stderr so we can verify output
@@ -68,7 +68,7 @@ func TestGlideConfig_Import(t *testing.T) {
 		t.Fatal("Expected the lock to be generated")
 	}
 
-	goldenFile := "glide/expected_import_output.txt"
+	goldenFile := "glide/golden0.txt"
 	got := verboseOutput.String()
 	want := h.GetTestFileString(goldenFile)
 	if want != got {
@@ -82,7 +82,7 @@ func TestGlideConfig_Import(t *testing.T) {
 	}
 }
 
-func TestGlideConfig_Import2(t *testing.T) {
+func TestGlideConfig_Import_BranchWithSemverName(t *testing.T) {
 	h := test.NewHelper(t)
 	defer h.Cleanup()
 
@@ -92,8 +92,8 @@ func TestGlideConfig_Import2(t *testing.T) {
 	defer sm.Release()
 
 	h.TempDir(filepath.Join("src", testGlideProjectRoot))
-	h.TempCopy(filepath.Join(testGlideProjectRoot, glideYamlName), "glide/foo/glide.yaml")
-	h.TempCopy(filepath.Join(testGlideProjectRoot, glideLockName), "glide/foo/glide.lock")
+	h.TempCopy(filepath.Join(testGlideProjectRoot, glideYamlName), "glide/glide1.yaml")
+	h.TempCopy(filepath.Join(testGlideProjectRoot, glideLockName), "glide/glide1.lock")
 	projectRoot := h.Path(testGlideProjectRoot)
 
 	// Capture stderr so we can verify output
@@ -116,7 +116,7 @@ func TestGlideConfig_Import2(t *testing.T) {
 		t.Fatal("Expected the lock to be generated")
 	}
 
-	goldenFile := "glide/foo/expected_import_output.txt"
+	goldenFile := "glide/golden1.txt"
 	got := verboseOutput.String()
 	want := h.GetTestFileString(goldenFile)
 	if want != got {
@@ -138,9 +138,9 @@ func TestGlideConfig_Import_MissingLockFile(t *testing.T) {
 	h.Must(err)
 	defer sm.Release()
 
-	h.TempDir(filepath.Join("src", "glidetest"))
-	h.TempCopy(filepath.Join("glidetest", glideYamlName), "glide/glide.yaml")
-	projectRoot := h.Path("glidetest")
+	h.TempDir(filepath.Join("src", testGlideProjectRoot))
+	h.TempCopy(filepath.Join(testGlideProjectRoot, glideYamlName), "glide/glide0.yaml")
+	projectRoot := h.Path(testGlideProjectRoot)
 
 	g := newGlideImporter(ctx.Err, true, sm)
 	if !g.HasDepMetadata(projectRoot) {

cmd/dep/testdata/glide/glide1.lock

@@ -0,0 +1,18 @@
+hash: 3b7d5be7d68cd94765ac91ea2f58b554151f67f5d0bf499ea8cadb600538a0e5
+updated: 2017-05-03T15:13:27.629768623+02:00
+imports:
+- name: github.com/DataDog/datadog-go
+  version: 0ddda6bee21174ef6c4873647cb0d6ec9cba996f
+  subpackages:
+  - statsd
+- name: github.com/mikespook/gearman-go
+  version: b79fee29655dcdce7ba4a738f8388f9862b6779e
+  subpackages:
+  - worker
+- name: gopkg.in/mgo.v2
+  version: 29cc868a5ca65f401ff318143f9408d02f4799cc
+  subpackages:
+  - bson
+  - internal/sasl
+  - internal/scram
+devImports: []

cmd/dep/testdata/glide/glide1.yaml

@@ -0,0 +1,14 @@
+package: github.com/wondernetwork/go-wiu-backend
+import:
+- package: github.com/mikespook/gearman-go
+  version: master
+  subpackages:
+  - worker
+- package: gopkg.in/mgo.v2
+  version: v2
+  subpackages:
+  - bson
+- package: github.com/DataDog/datadog-go
+  version: ~1.1
+  subpackages:
+  - statsd

cmd/dep/testdata/glide/expected_import_output.txt → cmd/dep/testdata/glide/golden0.txt

@@ -1,7 +1,8 @@
 Detected glide configuration files...
 Converting from glide.yaml and glide.lock...
-  Using ^0.8.1 as initial constraint for imported dep github.com/sdboyer/deptest
-  Trying v0.8.1 (3f4c3be) as initial lock for imported dep github.com/sdboyer/deptest
+  Using master as initial constraint for imported dep github.com/sdboyer/deptest
   Using ^2.0.0 as initial constraint for imported dep github.com/sdboyer/deptestdos
+  Using master as initial constraint for imported dep github.com/golang/lint
+  Trying v0.8.1 (3f4c3be) as initial lock for imported dep github.com/sdboyer/deptest
   Trying v2.0.0 (5c60720) as initial lock for imported dep github.com/sdboyer/deptestdos
-  Using cb00e56 as initial hint for imported dep github.com/golang/lint
+  Trying master (cb00e56) as initial lock for imported dep github.com/golang/lint

cmd/dep/testdata/glide/golden1.txt

@@ -0,0 +1,8 @@
+Detected glide configuration files...
+Converting from glide.yaml and glide.lock...
+  Using master as initial constraint for imported dep github.com/mikespook/gearman-go
+  Using v2 as initial constraint for imported dep gopkg.in/mgo.v2
+  Using ~1.1.0 as initial constraint for imported dep github.com/DataDog/datadog-go
+  Trying 1.1.0 (0ddda6b) as initial lock for imported dep github.com/DataDog/datadog-go
+  Trying master (b79fee2) as initial lock for imported dep github.com/mikespook/gearman-go
+  Trying v2 (29cc868) as initial lock for imported dep gopkg.in/mgo.v2

cmd/dep/testdata/harness_tests/init/glide/case4/final/Gopkg.toml

@@ -0,0 +1,12 @@
+
+[[constraint]]
+  name = "github.com/DataDog/datadog-go"
+  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/mikespook/gearman-go"
+  version = "0.1.3"
+
+[[constraint]]
+  branch = "v2"
+  name = "gopkg.in/mgo.v2"

cmd/dep/testdata/harness_tests/init/glide/case4/initial/glide.yaml

@@ -0,0 +1,14 @@
+package: github.com/wondernetwork/go-wiu-backend
+import:
+- package: github.com/mikespook/gearman-go
+  version: master
+  subpackages:
+  - worker
+- package: gopkg.in/mgo.v2
+  version: v2
+  subpackages:
+  - bson
+- package: github.com/DataDog/datadog-go
+  version: ~1.1
+  subpackages:
+  - statsd

cmd/dep/testdata/harness_tests/init/glide/case4/initial/main.go

@@ -0,0 +1,14 @@
+// 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 (
+	_ "github.com/DataDog/datadog-go/statsd"
+	_ "github.com/mikespook/gearman-go/worker"
+	_ "gopkg.in/mgo.v2/bson"
+)
+
+func main() {
+}

cmd/dep/testdata/harness_tests/init/glide/case4/testcase.json

@@ -0,0 +1,17 @@
+{
+  "commands": [
+    ["init", "-no-examples"]
+  ],
+  "error-expected": "",
+  "gopath-initial": {},
+  "vendor-final": [
+    "github.com/DataDog/datadog-go",
+    "github.com/mikespook/gearman-go",
+    "gopkg.in/mgo.v2/bson",
+    "gopkg.in/mgo.v2/dbtest",
+    "gopkg.in/mgo.v2/internal",
+    "gopkg.in/mgo.v2/testdb",
+    "gopkg.in/mgo.v2/testserver",
+    "gopkg.in/mgo.v2/txn"
+  ]
+}