diff --git a/cmd/dep/godep_config_test.go b/cmd/dep/godep_config_test.go index 7a3115fbfd..6263d69cbe 100644 --- a/cmd/dep/godep_config_test.go +++ b/cmd/dep/godep_config_test.go @@ -11,6 +11,7 @@ import ( "testing" "github.com/golang/dep" + "github.com/golang/dep/internal/gps" "github.com/golang/dep/internal/test" ) @@ -102,9 +103,20 @@ func TestGodepConvertProject(t *testing.T) { t.Fatalf("Expected the lock to have a project for 'github.com/sdboyer/deptest' but got '%s'", p.Ident().ProjectRoot) } - lv := p.Version().String() - if lv != "v1.0.0" { - t.Fatalf("Expected locked revision to be 'v1.0.0', got %s", lv) + lv := p.Version() + lpv, ok := lv.(gps.PairedVersion) + if !ok { + t.Fatalf("Expected locked version to be PairedVersion but got %T", lv) + } + + rev := lpv.Underlying() + if rev != "6a741be0cc55ecbe4f45690ebfd606a956d5f14a" { + t.Fatalf("Expected locked revision to be '6a741be0cc55ecbe4f45690ebfd606a956d5f14a', got %s", rev) + } + + ver := lpv.String() + if ver != "v1.0.0" { + t.Fatalf("Expected locked version to be 'v1.0.0', got %s", ver) } } diff --git a/cmd/dep/testdata/harness_tests/init/godep/case2/final/Gopkg.lock b/cmd/dep/testdata/harness_tests/init/godep/case2/final/Gopkg.lock index 1c0d9e30a9..4af26eeafb 100644 --- a/cmd/dep/testdata/harness_tests/init/godep/case2/final/Gopkg.lock +++ b/cmd/dep/testdata/harness_tests/init/godep/case2/final/Gopkg.lock @@ -3,8 +3,8 @@ memo = "1ed417a0bec57ffe988fae1cba8f3d49994fb893394d61844e0b3c96d69573fe" [[projects]] name = "github.com/sdboyer/deptest" packages = ["."] - revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf" - version = "v1.0.0" + revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f" + version = "v0.8.1" [[projects]] name = "github.com/sdboyer/deptestdos" diff --git a/cmd/dep/testdata/harness_tests/init/godep/case2/testcase.json b/cmd/dep/testdata/harness_tests/init/godep/case2/testcase.json index 2750c8d78f..5c387ed5f7 100644 --- a/cmd/dep/testdata/harness_tests/init/godep/case2/testcase.json +++ b/cmd/dep/testdata/harness_tests/init/godep/case2/testcase.json @@ -3,7 +3,10 @@ ["init", "-no-examples", "-skip-tools"] ], "error-expected": "", - "gopath-initial": {}, + "gopath-initial": { + "github.com/sdboyer/deptest": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f", + "github.com/sdboyer/deptestdos": "5c607206be5decd28e6263ffffdcee067266015e" + }, "vendor-final": [ "github.com/sdboyer/deptest", "github.com/sdboyer/deptestdos"