From df4ffb5a7b73b9592ac888cd35cc68ac3bc1d76a Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Wed, 28 Jan 2015 12:16:23 -0800 Subject: [PATCH] affinity: Ensure affinities can be chained. Signed-off-by: Andrea Luzzardi --- scheduler/filter/affinity_test.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scheduler/filter/affinity_test.go b/scheduler/filter/affinity_test.go index ba54873b56..0260397de5 100644 --- a/scheduler/filter/affinity_test.go +++ b/scheduler/filter/affinity_test.go @@ -174,6 +174,26 @@ func TestAffinityFilter(t *testing.T) { assert.NoError(t, err) assert.Len(t, result, 2) + // Ensure that constraints can be chained. + result, err = f.Filter(&dockerclient.ContainerConfig{ + Env: []string{ + "affinity:container!=container-n0-1-id", + "affinity:container!=container-n1-1-id", + }, + }, nodes) + assert.NoError(t, err) + assert.Len(t, result, 1) + assert.Equal(t, result[0], nodes[2]) + + // Ensure that constraints can be chained. + result, err = f.Filter(&dockerclient.ContainerConfig{ + Env: []string{ + "affinity:container==container-n0-1-id", + "affinity:container==container-n1-1-id", + }, + }, nodes) + assert.Error(t, err) + // Not support = any more result, err = f.Filter(&dockerclient.ContainerConfig{ Env: []string{"affinity:image=image-0:tag3"},