Add a handful more harness tests

Also some comment cleanup, and relocate an errant test.

Author: sdboyer

cmd/dep/ensure.go

@@ -480,7 +480,6 @@ func (cmd *ensureCommand) runAdd(ctx *dep.Ctx, args []string, p *dep.Project, sm
 
 			instr.ephReq[path] = true
 			instr.typ |= isInManifest
-			//p.Manifest.Required = append(p.Manifest.Required, path)
 		} else if inImports {
 			if !someConstraint {
 				if exmap[path] {
@@ -539,8 +538,7 @@ func (cmd *ensureCommand) runAdd(ctx *dep.Ctx, args []string, p *dep.Project, sm
 	}
 	solution, err := solver.Solve()
 	if err != nil {
-		// TODO(sdboyer) detect if the failure was specifically about some of
-		// the -add arguments
+		// TODO(sdboyer) detect if the failure was specifically about some of the -add arguments
 		handleAllTheFailuresOfTheWorld(err)
 		return errors.Wrap(err, "ensure Solve()")
 	}

cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/final/Gopkg.lock

@@ -0,0 +1,8 @@
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/sdboyer/deptesttres"
+
+[[constraint]]
+  name = "github.com/sdboyer/deptest"
+  version = "0.8.1"

cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/final/Gopkg.toml

@@ -0,0 +1,13 @@
+// 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/sdboyer/deptesttres"
+)
+
+func main() {
+	type a deptesttres.Bar
+}

cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/initial/main.go

@@ -0,0 +1,10 @@
+{
+  "commands": [
+    ["init", "-no-examples"],
+    ["ensure", "-add", "github.com/sdboyer/deptest", "github.com/sdboyer/[email protected]"]
+  ],
+  "vendor-final": [
+      "github.com/sdboyer/deptest",
+      "github.com/sdboyer/deptesttres"
+  ]
+}

cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/testcase.json

@@ -0,0 +1,4 @@
+
+[[constraint]]
+  name = "github.com/sdboyer/deptest"
+  version = "1.0.0"

cmd/dep/testdata/harness_tests/ensure/add/all-new-double/final/Gopkg.lock

@@ -0,0 +1,13 @@
+// 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/sdboyer/deptest"
+)
+
+func main() {
+	type a deptest.Bar
+}

cmd/dep/testdata/harness_tests/ensure/add/all-new-double/final/Gopkg.toml

@@ -0,0 +1,10 @@
+{
+  "commands": [
+    ["init", "-no-examples"],
+    ["ensure", "-add", "github.com/sdboyer/deptesttres", "github.com/sdboyer/deptesttres/subp"]
+  ],
+  "vendor-final": [
+      "github.com/sdboyer/deptest",
+      "github.com/sdboyer/deptesttres"
+  ]
+}

cmd/dep/testdata/harness_tests/ensure/add/all-new-double/initial/main.go

@@ -0,0 +1,8 @@
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/sdboyer/deptesttres"
+
+[[constraint]]
+  name = "github.com/sdboyer/deptest"
+  version = "0.8.1"

cmd/dep/testdata/harness_tests/ensure/add/all-new-double/testcase.json

@@ -0,0 +1,13 @@
+// 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/sdboyer/deptesttres"
+)
+
+func main() {
+	type a deptesttres.Bar
+}

cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/final/Gopkg.lock

@@ -0,0 +1,10 @@
+{
+  "commands": [
+    ["init", "-no-examples"],
+    ["ensure", "-add", "github.com/sdboyer/[email protected]"]
+  ],
+  "vendor-final": [
+      "github.com/sdboyer/deptest",
+      "github.com/sdboyer/deptesttres"
+  ]
+}

cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/final/Gopkg.toml

@@ -0,0 +1,4 @@
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/sdboyer/deptesttres"

cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/initial/main.go

@@ -0,0 +1,13 @@
+// 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/sdboyer/deptesttres"
+)
+
+func main() {
+	type a deptesttres.Bar
+}

cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/testcase.json

@@ -0,0 +1,10 @@
+{
+  "commands": [
+    ["init", "-no-examples"],
+    ["ensure", "-add", "github.com/sdboyer/deptest"]
+  ],
+  "vendor-final": [
+      "github.com/sdboyer/deptest",
+      "github.com/sdboyer/deptesttres"
+  ]
+}

cmd/dep/testdata/harness_tests/ensure/add/all-new/final/Gopkg.lock

@@ -0,0 +1,4 @@
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/sdboyer/deptesttres"

cmd/dep/testdata/harness_tests/ensure/add/all-new/final/Gopkg.toml

@@ -0,0 +1,13 @@
+// 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/sdboyer/deptesttres"
+)
+
+func main() {
+	type a deptesttres.Bar
+}

cmd/dep/testdata/harness_tests/ensure/add/all-new/initial/main.go

@@ -0,0 +1,10 @@
+{
+  "commands": [
+    ["init", "-no-examples"],
+    ["ensure", "-add", "github.com/sdboyer/[email protected]", "github.com/sdboyer/[email protected]"]
+  ],
+  "vendor-final": [
+      "github.com/sdboyer/deptesttres"
+  ],
+  "error-expected": "can only specify rules once per project being added; rules were given at least twice for github.com/sdboyer/deptest"
+}

cmd/dep/testdata/harness_tests/ensure/add/all-new/testcase.json

@@ -81,43 +81,3 @@ func TestSourceManager_InferConstraint_InvalidInput(t *testing.T) {
 		}
 	}
 }
-
-func TestInvalidEnsureFlagCombinations(t *testing.T) {
-	ec := &ensureCommand{
-		update: true,
-		add:    true,
-	}
-
-	if err := ec.validateFlags(); err == nil {
-		t.Error("-add and -update together should fail validation")
-	}
-
-	ec.vendorOnly, ec.add = true, false
-	if err := ec.validateFlags(); err == nil {
-		t.Error("-vendor-only with -update should fail validation")
-	}
-
-	ec.add, ec.update = true, false
-	if err := ec.validateFlags(); err == nil {
-		t.Error("-vendor-only with -add should fail validation")
-	}
-
-	ec.noVendor, ec.add = true, false
-	if err := ec.validateFlags(); err == nil {
-		t.Error("-vendor-only with -no-vendor should fail validation")
-	}
-	ec.noVendor = false
-
-	// Also verify that the plain ensure path takes no args. This is a shady
-	// test, as lots of other things COULD return errors, and we don't check
-	// anything other than the error being non-nil. For now, it works well
-	// because a panic will quickly result if the initial arg length validation
-	// checks are incorrectly handled.
-	if err := ec.runDefault(nil, []string{"foo"}, nil, nil, gps.SolveParameters{}); err == nil {
-		t.Errorf("no args to plain ensure with -vendor-only")
-	}
-	ec.vendorOnly = false
-	if err := ec.runDefault(nil, []string{"foo"}, nil, nil, gps.SolveParameters{}); err == nil {
-		t.Errorf("no args to plain ensure")
-	}
-}