tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 15:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Flaky test due to array random order

Browse Source 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-10-16 17:13:20 +02:00
parent 869a0b8dd8
commit 487a4e485c
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
aci/convert/convert_test.go
View File

@ -761,17 +761,23 @@ func TestConvertSecrets(t *testing.T) {
}, },
}, },
} }
vs, err := pSquashedDefaultAndAbs.getAciSecretVolumes() volumes, err := pSquashedDefaultAndAbs.getAciSecretVolumes()
assert.NilError(t, err) assert.NilError(t, err)
assert.Equal(t, len(vs), 2) assert.Equal(t, len(volumes), 2)
defaultVolumeName := getServiceSecretKey(serviceName, defaultSecretsPath) defaultVolumeName := getServiceSecretKey(serviceName, defaultSecretsPath)
assert.Equal(t, *vs[0].Name, defaultVolumeName)
assert.Equal(t, len(vs[0].Secret), 3)
homeVolumeName := getServiceSecretKey(serviceName, absBasePath) homeVolumeName := getServiceSecretKey(serviceName, absBasePath)
assert.Equal(t, *vs[1].Name, homeVolumeName) // random order since this was created from a map...
assert.Equal(t, len(vs[1].Secret), 2) for _, vol := range volumes {
switch *vol.Name {
case defaultVolumeName:
assert.Equal(t, len(vol.Secret), 3)
case homeVolumeName:
assert.Equal(t, len(vol.Secret), 2)
default:
assert.Assert(t, false, "unexpected volume name: "+*vol.Name)
}
}
s := serviceConfigAciHelper(pSquashedDefaultAndAbs.Services[0]) s := serviceConfigAciHelper(pSquashedDefaultAndAbs.Services[0])
vms, err := s.getAciSecretsVolumeMounts() vms, err := s.getAciSecretsVolumeMounts()