Skip to content
This repository has been archived by the owner on Oct 22, 2021. It is now read-only.

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergei Utinski committed Apr 10, 2019
1 parent 4c4c56f commit 27bd7c9
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion builder/packages_image_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func TestNewDockerPopulator(t *testing.T) {
assert.NoError(err)

roleManifestPath := filepath.Join(workDir, "../test-assets/role-manifests/tor-good.yml")
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release})
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release}, false)
assert.NoError(err)

packagesImageBuilder, err := NewPackagesImageBuilder("foo", compiledPackagesDir, targetPath, "3.14.15", ui)
Expand Down
10 changes: 5 additions & 5 deletions builder/role_image_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func TestGenerateRoleImageDockerfile(t *testing.T) {
assert.NoError(err)

roleManifestPath := filepath.Join(workDir, "../test-assets/role-manifests/tor-good.yml")
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release})
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release}, false)
assert.NoError(err)

torOpinionsDir := filepath.Join(workDir, "../test-assets/tor-opinions")
Expand Down Expand Up @@ -97,7 +97,7 @@ func TestGenerateRoleImageRunScript(t *testing.T) {
assert.NoError(err)

roleManifestPath := filepath.Join(workDir, "../test-assets/role-manifests/tor-good.yml")
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release})
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release}, false)
assert.NoError(err)
torOpinionsDir := filepath.Join(workDir, "../test-assets/tor-opinions")
lightOpinionsPath := filepath.Join(torOpinionsDir, "opinions.yml")
Expand Down Expand Up @@ -151,7 +151,7 @@ func TestGenerateRoleImageJobsConfig(t *testing.T) {
assert.NoError(err)

roleManifestPath := filepath.Join(workDir, "../test-assets/role-manifests/tor-good.yml")
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release})
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release}, false)
assert.NoError(err)

torOpinionsDir := filepath.Join(workDir, "../test-assets/tor-opinions")
Expand Down Expand Up @@ -200,7 +200,7 @@ func TestGenerateRoleImageDockerfileDir(t *testing.T) {
assert.NoError(err)

roleManifestPath := filepath.Join(workDir, "../test-assets/role-manifests/tor-good.yml")
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release})
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release}, false)
assert.NoError(err)

torOpinionsDir := filepath.Join(workDir, "../test-assets/tor-opinions")
Expand Down Expand Up @@ -373,7 +373,7 @@ func TestBuildRoleImages(t *testing.T) {
assert.NoError(err)

roleManifestPath := filepath.Join(workDir, "../test-assets/role-manifests/tor-good.yml")
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release})
rolesManifest, err := model.LoadRoleManifest(roleManifestPath, []*model.Release{release}, false)
assert.NoError(err)
torOpinionsDir := filepath.Join(workDir, "../test-assets/tor-opinions")
lightOpinionsPath := filepath.Join(torOpinionsDir, "opinions.yml")
Expand Down
2 changes: 1 addition & 1 deletion kube/job_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func jobTestLoadRole(assert *assert.Assertions, roleName string) *model.Role {
if !assert.NoError(err) {
return nil
}
manifest, err := model.LoadRoleManifest(manifestPath, []*model.Release{release})
manifest, err := model.LoadRoleManifest(manifestPath, []*model.Release{release}, false)
if !assert.NoError(err) {
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion kube/pod_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func podTestLoadRole(assert *assert.Assertions) *model.Role {
if !assert.NoError(err) {
return nil
}
manifest, err := model.LoadRoleManifest(manifestPath, []*model.Release{release})
manifest, err := model.LoadRoleManifest(manifestPath, []*model.Release{release}, false)
if !assert.NoError(err) {
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion kube/service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func serviceTestLoadRole(assert *assert.Assertions, manifestName string) (*model
if !assert.NoError(err) {
return nil, nil
}
manifest, err := model.LoadRoleManifest(manifestPath, []*model.Release{release})
manifest, err := model.LoadRoleManifest(manifestPath, []*model.Release{release}, false)
if !assert.NoError(err) {
return nil, nil
}
Expand Down
2 changes: 1 addition & 1 deletion kube/stateful_set_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func statefulSetTestLoadManifest(assert *assert.Assertions, manifestName string)
if !assert.NoError(err) {
return nil, nil
}
manifest, err := model.LoadRoleManifest(manifestPath, []*model.Release{release})
manifest, err := model.LoadRoleManifest(manifestPath, []*model.Release{release}, false)
if !assert.NoError(err) {
return nil, nil
}
Expand Down

0 comments on commit 27bd7c9

Please sign in to comment.