From 7d930b8809d4bd7f239d69ed09a6890c6d2b2486 Mon Sep 17 00:00:00 2001
From: Andrea Luzzardi <aluzzardi@gmail.com>
Date: Fri, 21 Nov 2014 14:02:21 -0800
Subject: [PATCH] label filter: Ensure constraints are evaluated as logical
 ANDs.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
---
 scheduler/filter/label_test.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scheduler/filter/label_test.go b/scheduler/filter/label_test.go
index bd47b6c384..aaab4c17b9 100644
--- a/scheduler/filter/label_test.go
+++ b/scheduler/filter/label_test.go
@@ -61,4 +61,12 @@ func TestLabeleFilter(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Len(t, result, 2)
 	assert.NotContains(t, result, nodes[2])
+
+	// Make sure constraints are evaluated as logical ANDs.
+	result, err = f.Filter(&dockerclient.ContainerConfig{
+		Env: []string{"constraint:name=node0", "constraint:group=1"},
+	}, nodes)
+	assert.NoError(t, err)
+	assert.Len(t, result, 1)
+	assert.Equal(t, result[0], nodes[0])
 }