| Index: cipd/client/cipd/ensure/good_test.go
|
| diff --git a/cipd/client/cipd/ensure/good_test.go b/cipd/client/cipd/ensure/good_test.go
|
| index d65593bc75dfd2b8766d318e15c9d14bcdf2c038..2c6bdb277718ceab2e65761a3226310d223dd734 100644
|
| --- a/cipd/client/cipd/ensure/good_test.go
|
| +++ b/cipd/client/cipd/ensure/good_test.go
|
| @@ -36,7 +36,7 @@ var goodEnsureFiles = []struct {
|
| "path/to/other_package some_tag:version",
|
| "path/to/yet_another a_ref",
|
| ),
|
| - &ResolvedFile{"", common.PinSliceByRoot{
|
| + &ResolvedFile{"", common.PinSliceBySubdir{
|
| "": {
|
| p("path/to/package", "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"),
|
| p("path/to/other_package", "some_tag:version"),
|
| @@ -50,7 +50,7 @@ var goodEnsureFiles = []struct {
|
| f(
|
| "path/to/package/${platform}-${arch} latest",
|
| ),
|
| - &ResolvedFile{"", common.PinSliceByRoot{
|
| + &ResolvedFile{"", common.PinSliceBySubdir{
|
| "": {
|
| p("path/to/package/test_plat-test_arch", "latest"),
|
| },
|
| @@ -62,7 +62,7 @@ var goodEnsureFiles = []struct {
|
| f(
|
| "path/to/package/${platform}-${arch=neep,test_arch} latest",
|
| ),
|
| - &ResolvedFile{"", common.PinSliceByRoot{
|
| + &ResolvedFile{"", common.PinSliceBySubdir{
|
| "": {p("path/to/package/test_plat-test_arch", "latest")},
|
| }},
|
| },
|
| @@ -72,22 +72,22 @@ var goodEnsureFiles = []struct {
|
| f(
|
| "path/to/package/${platform=spaz}-${arch=neep,test_arch} latest",
|
| ),
|
| - &ResolvedFile{"", common.PinSliceByRoot{}},
|
| + &ResolvedFile{"", common.PinSliceBySubdir{}},
|
| },
|
|
|
| {
|
| - "Root directives",
|
| + "Subdir directives",
|
| f(
|
| "some/package latest",
|
| "",
|
| - "@Root a/subdir with spaces",
|
| + "@Subdir a/subdir with spaces",
|
| "some/package canary",
|
| "some/other/package tag:value",
|
| "",
|
| - "@Root", // reset back to empty
|
| + "@Subdir", // reset back to empty
|
| "cool/package beef",
|
| ),
|
| - &ResolvedFile{"", common.PinSliceByRoot{
|
| + &ResolvedFile{"", common.PinSliceBySubdir{
|
| "": {
|
| p("some/package", "latest"),
|
| p("cool/package", "beef"),
|
| @@ -106,7 +106,7 @@ var goodEnsureFiles = []struct {
|
| "",
|
| "some/package version",
|
| ),
|
| - &ResolvedFile{"https://cipd.example.com/path/to/thing", common.PinSliceByRoot{
|
| + &ResolvedFile{"https://cipd.example.com/path/to/thing", common.PinSliceBySubdir{
|
| "": {
|
| p("some/package", "version"),
|
| },
|
|
|