public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix mapping of ids in test.

This commit is contained in:
Jan Mußler 2020-12-08 23:11:57 +01:00
parent 0bab888dc7
commit 51f4683204
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/cluster/volumes_test.go
View File

@ -233,7 +233,11 @@ func TestMigrateEBS(t *testing.T) {
ps := v1.PersistentVolumeSpec{} ps := v1.PersistentVolumeSpec{}
ps.AWSElasticBlockStore = &v1.AWSElasticBlockStoreVolumeSource{} ps.AWSElasticBlockStore = &v1.AWSElasticBlockStoreVolumeSource{}
ps.AWSElasticBlockStore.VolumeID = "vol-1111" ps.AWSElasticBlockStore.VolumeID = "ebs-volume-1"
ps2 := v1.PersistentVolumeSpec{}
ps2.AWSElasticBlockStore = &v1.AWSElasticBlockStoreVolumeSource{}
ps2.AWSElasticBlockStore.VolumeID = "ebs-volume-2"
pvList := &v1.PersistentVolumeList{ pvList := &v1.PersistentVolumeList{
Items: []v1.PersistentVolume{ Items: []v1.PersistentVolume{
@ -243,6 +247,12 @@ func TestMigrateEBS(t *testing.T) {
}, },
Spec: ps, Spec: ps,
}, },
{
ObjectMeta: metav1.ObjectMeta{
Name: "persistent-volume-1",
},
Spec: ps2,
},
}, },
} }
@ -262,16 +272,26 @@ func TestMigrateEBS(t *testing.T) {
cluster.KubeClient.Pods(namespace).Create(context.TODO(), &pod, metav1.CreateOptions{}) cluster.KubeClient.Pods(namespace).Create(context.TODO(), &pod, metav1.CreateOptions{})
pod = v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: clusterName + "-1",
Labels: filterLabels,
},
Spec: v1.PodSpec{},
}
cluster.KubeClient.Pods(namespace).Create(context.TODO(), &pod, metav1.CreateOptions{})
ctrl := gomock.NewController(t) ctrl := gomock.NewController(t)
defer ctrl.Finish() defer ctrl.Finish()
resizer := mocks.NewMockVolumeResizer(ctrl) resizer := mocks.NewMockVolumeResizer(ctrl)
resizer.EXPECT().DescribeVolumes(gomock.Eq([]string{"vol-1111"})).Return( resizer.EXPECT().DescribeVolumes(gomock.Eq([]string{"vol-1111"})).Return(
[]volumes.VolumeProperties{ []volumes.VolumeProperties{
{VolumeID: "persistent-volume-0", VolumeType: "gp2", Size: 100}, {VolumeID: "ebs-volume-1", VolumeType: "gp2", Size: 100},
{VolumeID: "persistent-volume-1", VolumeType: "gp3", Size: 100}}, nil) {VolumeID: "ebs-volume-2", VolumeType: "gp3", Size: 100}}, nil)
// expect onl ygp2 volume to be modified // expect only gp2 volume to be modified
resizer.EXPECT().ModifyVolume(gomock.Eq("persistent-volume-0"), gomock.Eq("gp3"), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil) resizer.EXPECT().ModifyVolume(gomock.Eq("persistent-volume-0"), gomock.Eq("gp3"), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
cluster.VolumeResizer = resizer cluster.VolumeResizer = resizer