Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

[WIP] dep: Enable importing other tools and add integration tests #1277

Merged
merged 5 commits into from
Nov 10, 2017
Merged

[WIP] dep: Enable importing other tools and add integration tests #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
97cf253
dep: Enable importing other tools and add integration tests
ChinmayR Oct 16, 2017
ebcbca4
Merge branch 'master' into import-glide
ChinmayR Oct 25, 2017
9379c0e
Merge branch 'master' into import-glide
ChinmayR Oct 26, 2017
4f64d31
Merge branch 'master' into import-glide
ChinmayR Nov 9, 2017
95be023
Addressed PR comments
ChinmayR Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ BUG FIXES:
* Releases targeting Windows now have a `.exe` suffix (#1291).
* Adaptively recover from dirty and corrupted git repositories in cache (#1279).

WIP:

* dep: Enable importing external configuration from dependencies during init (#1277)

IMPROVEMENTS:

* Log as dependencies are pre-fetched during dep init ([#1176](https://github.com/golang/dep/pull/1176)).
Expand Down Expand Up @@ -52,7 +56,6 @@ WIP:
* gps: Process canonical import paths. (#1017)
* gps: Persistent cache. (#1127, #1215)


# v0.3.1

* gps: Add satisfiability check for case variants (#1079)
Expand Down
3 changes: 1 addition & 2 deletions cmd/dep/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,7 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
}
}

rootAnalyzer.skipTools = true // Don't import external config during solve for now
copyLock := *p.Lock // Copy lock before solving. Use this to separate new lock projects from solved lock
copyLock := *p.Lock // Copy lock before solving. Use this to separate new lock projects from solved lock

params := gps.SolveParameters{
RootDir: root,
Expand Down
2 changes: 1 addition & 1 deletion cmd/dep/testdata/harness_tests/init/glide/case3/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Import glide config in dependencies.
Import glide config in direct dependencies.
4 changes: 2 additions & 2 deletions cmd/dep/testdata/harness_tests/init/glide/case3/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...sts/init/glide/case3/testcase.json.ignore → ...ness_tests/init/glide/case3/testcase.json
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions cmd/dep/testdata/harness_tests/init/glide/corrupt-glide/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Import deptestglideA tag v0.3.0 which has a corrupt glide manifest.
5 changes: 5 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/corrupt-glide/initial/glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/corrupt-glide/initial/glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package: github.com/golang/notexist
homepage: http://example.com
license: MIT
owners:
- name: Sam Boyer
email: [email protected]
homepage: http://sdboyer.io
import:
- package: github.com/ChinmayR/deptestglideA
version: v0.3.0
11 changes: 11 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/corrupt-glide/initial/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// 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/ChinmayR/deptestglideA"
)

type PointToDepTestGlideAv010 deptestglideA.Bversion2
6 changes: 6 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/corrupt-glide/testcase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"commands": [
["init", "-no-examples", "-v"]
],
"error-expected": "v0.3.0: unable to parse"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, I am going to keep this test case for now but once #1315 (which is also part of the epic) is implemented, it will probably be removed because the behavior is changing to not hard fail during solve. The testdata in your repo will be kept and used though, thank you for building that out! ❤️

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}
1 change: 1 addition & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-conflict/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Take a direct dependency on a transient dependency where the versions are conflicted. Resolving should fail.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this test starts failing after the other changes I have requested are made, let's ignore it test temporarily ( add a .ignore file extension to the testcase.json file). The scenario may require additional handling and will be addressed in another issue: #1316.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test does not fail since the existing code only removes transient dependencies read from importers. Since there is also a direct dependency here, the test passes.

7 changes: 7 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-conflict/initial/glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-conflict/initial/glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package: github.com/golang/notexist
homepage: http://example.com
license: MIT
owners:
- name: Sam Boyer
email: [email protected]
homepage: http://sdboyer.io
import:
- package: github.com/ChinmayR/deptestglideA
version: v0.1.0
- package: github.com/ChinmayR/deptestglideB
version: v0.2.0
13 changes: 13 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-conflict/initial/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/ChinmayR/deptestglideA"
"github.com/ChinmayR/deptestglideB"
)

type PointToDepTestGlideAv010 deptestglideA.Bversion1
type FooVersion2 deptestglideB.FooVersion2
6 changes: 6 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-conflict/testcase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"commands": [
["init", "-no-examples", "-v"]
],
"error-expected": "master: Could not introduce github.com/ChinmayR/deptestglideA@master, as it is not allowed by constraint ^0.1.0 from project github.com/golang/notexist."
}
1 change: 1 addition & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Take a direct dependency on a transient dependency where the versions are not conflicted. Resolving should pass.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this test starts failing after the other changes I have requested are made, let's ignore it test temporarily ( add a .ignore file extension to the testcase.json file). The scenario may require additional handling and will be addressed in another issue: #1316.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test does not fail since the existing code only removes transient dependencies read from importers. Since there is also a direct dependency here, the test passes.

21 changes: 21 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

[[constraint]]
name = "github.com/ChinmayR/deptestglideA"
version = "0.2.0"

[[constraint]]
name = "github.com/ChinmayR/deptestglideB"
5 changes: 5 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/initial/glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/initial/glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package: github.com/golang/notexist
homepage: http://example.com
license: MIT
owners:
- name: Sam Boyer
email: [email protected]
homepage: http://sdboyer.io
import:
- package: github.com/ChinmayR/deptestglideA
version: v0.2.0
- package: github.com/ChinmayR/deptestglideB
version: ~0.1.0
13 changes: 13 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/initial/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/ChinmayR/deptestglideA"
"github.com/ChinmayR/deptestglideB"
)

type PointToDepTestGlideAv010 deptestglideA.Bversion2
type FooVersion2 deptestglideB.FooVersion2
9 changes: 9 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/testcase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"commands": [
["init", "-no-examples", "-v"]
],
"vendor-final": [
"github.com/ChinmayR/deptestglideA",
"github.com/ChinmayR/deptestglideB"
]
}
1 change: 1 addition & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-conflict/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Have two transient dependencies have different versions of the same repo. Resolving should fail.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is asserting an unwanted behavior that will be addressed in #1316. But it's a useful test case for that other story, so let's not remove it. Would you please add a .ignore to the testcase.json, and when we implement the other issue, we'll turn this test on, with the correct expected results (i.e. it should not fail).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test starts to fail since we do not import transient dependencies as constraints of the root repo. This results in incorrect resolving since only constraints that are imported are of direct dependencies of the root. I will add a comment to #1316 to also handle this case explicitly. Shouldn't the resolving for this test fail when the test case is enabled again as part of #1316 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe preferred versions handle this case but currently we have no idea of dealing with conflicting preferred versions.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'm a bit fuzzy off the top of my head on the topic of conflicting preferred versions. 😊 But that is a dep-wide question, not just for import, so I'd rather deal with it in that other issue and rope in Sam then.

7 changes: 7 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-conflict/initial/glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-conflict/initial/glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package: github.com/golang/notexist
homepage: http://example.com
license: MIT
owners:
- name: Sam Boyer
email: [email protected]
homepage: http://sdboyer.io
import:
- package: github.com/ChinmayR/deptestglideA
version: v0.4.0
- package: github.com/ChinmayR/deptestglideB
version: v0.3.0
13 changes: 13 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-conflict/initial/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/ChinmayR/deptestglideA"
"github.com/ChinmayR/deptestglideB"
)

type PointToDepTestGlideCv010 deptestglideA.Cversion1
type PointToDepTestGlideCv020 deptestglideB.Cversion2
6 changes: 6 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-conflict/testcase.json.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"commands": [
["init", "-no-examples", "-v"]
],
"error-expected": "No versions of github.com/ChinmayR/deptestglideB met constraints"
}
1 change: 1 addition & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Test if a transitive glide manifest is read.
27 changes: 27 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

[[constraint]]
name = "github.com/ChinmayR/deptestglideA"
version = "0.6.0"
5 changes: 5 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/initial/glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/initial/glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package: github.com/golang/notexist
homepage: http://example.com
license: MIT
owners:
- name: Sam Boyer
email: [email protected]
homepage: http://sdboyer.io
import:
- package: github.com/ChinmayR/deptestglideA
version: v0.6.0
11 changes: 11 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/initial/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// 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/ChinmayR/deptestglideA"
)

type PointToDepTestGlideAv010 deptestglideA.PointToDepTestGlideBv050
10 changes: 10 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/testcase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"commands": [
["init", "-no-examples", "-v"]
],
"vendor-final": [
"github.com/ChinmayR/deptestglideA",
"github.com/ChinmayR/deptestglideB",
"github.com/ChinmayR/deptestglideC"
]
}
2 changes: 2 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-unspecified/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Have two direct dependencies where one specifies a direct transient version,
and the other can take any transient but overlapping version. Resolving should pass.
27 changes: 27 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-unspecified/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-unspecified/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

[[constraint]]
name = "github.com/ChinmayR/deptestglideA"
version = "0.4.0"

[[constraint]]
name = "github.com/ChinmayR/deptestglideB"
version = "0.4.0"
7 changes: 7 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-unspecified/initial/glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions cmd/dep/testdata/harness_tests/init/glide/trans-trans-unspecified/initial/glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package: github.com/golang/notexist
homepage: http://example.com
license: MIT
owners:
- name: Sam Boyer
email: [email protected]
homepage: http://sdboyer.io
import:
- package: github.com/ChinmayR/deptestglideA
version: v0.4.0
- package: github.com/ChinmayR/deptestglideB
version: v0.4.0
Loading