Merge pull request kubernetes#3631 from deads2k/deads-add-set-deleteall

make StringSet.Delete accept multiple items

pkg/util/set.go

@@ -39,9 +39,11 @@ func (s StringSet) Insert(items ...string) {
 	}
 }
 
-// Delete removes item from the set.
-func (s StringSet) Delete(item string) {
-	delete(s, item)
+// Delete removes all items from the set.
+func (s StringSet) Delete(items ...string) {
+	for _, item := range items {
+		delete(s, item)
+	}
 }
 
 // Has returns true iff item is contained in the set.

pkg/util/set_test.go

@@ -59,6 +59,29 @@ func TestStringSet(t *testing.T) {
 	}
 }
 
+func TestStringSetDeleteMultiples(t *testing.T) {
+	s := StringSet{}
+	s.Insert("a", "b", "c")
+	if len(s) != 3 {
+		t.Errorf("Expected len=3: %d", len(s))
+	}
+
+	s.Delete("a", "c")
+	if len(s) != 1 {
+		t.Errorf("Expected len=1: %d", len(s))
+	}
+	if s.Has("a") {
+		t.Errorf("Unexpected contents: %#v", s)
+	}
+	if s.Has("c") {
+		t.Errorf("Unexpected contents: %#v", s)
+	}
+	if !s.Has("b") {
+		t.Errorf("Missing contents: %#v", s)
+	}
+
+}
+
 func TestNewStringSet(t *testing.T) {
 	s := NewStringSet("a", "b", "c")
 	if len(s) != 3 {