Skip to content

Commit

Permalink
Fix functional tests broken by v1alpha3 change
Browse files Browse the repository at this point in the history
Signed-off-by: David Vossel <[email protected]>
  • Loading branch information
davidvossel committed Jan 14, 2019
1 parent 0359b7f commit e16deaa
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tests/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ var _ = Describe("Config", func() {

BeforeEach(func() {
configMapName = "configmap-" + uuid.NewRandom().String()
configMapPath = config.GetConfigMapSourcePath(configMapName + "-vol")
configMapPath = config.GetConfigMapSourcePath(configMapName + "-disk")

data := map[string]string{
"option1": "value1",
Expand Down Expand Up @@ -150,7 +150,7 @@ var _ = Describe("Config", func() {

BeforeEach(func() {
secretName = "secret-" + uuid.NewRandom().String()
secretPath = config.GetSecretSourcePath(secretName + "-vol")
secretPath = config.GetSecretSourcePath(secretName + "-disk")

data := map[string]string{
"user": "admin",
Expand Down
2 changes: 1 addition & 1 deletion tests/replicaset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ var _ = Describe("VirtualMachineInstanceReplicaSet", func() {
Expect(err).To(BeNil())

Expect(len(reviewResponse.Details.Causes)).To(Equal(1))
Expect(reviewResponse.Details.Causes[0].Field).To(Equal("spec.template.spec.domain.devices.disks[1].volumeName"))
Expect(reviewResponse.Details.Causes[0].Field).To(Equal("spec.template.spec.domain.devices.disks[1].name"))
})
It("should update readyReplicas once VMIs are up", func() {
newRS := newReplicaSet()
Expand Down
2 changes: 1 addition & 1 deletion tests/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -1740,7 +1740,7 @@ func NewRandomVMIWithServiceAccount(serviceAccountName string) *v1.VirtualMachin
}

func AddServiceAccountDisk(vmi *v1.VirtualMachineInstance, serviceAccountName string) {
volumeName := serviceAccountName + "-vol"
volumeName := serviceAccountName + "-disk"
vmi.Spec.Volumes = append(vmi.Spec.Volumes, v1.Volume{
Name: volumeName,
VolumeSource: v1.VolumeSource{
Expand Down

0 comments on commit e16deaa

Please sign in to comment.