fix merge error in 78dd5fd

buildbot · Mar 14, 2014 · c47b7b6 · c47b7b6
1 parent 026a406
commit c47b7b6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/master/buildbot/test/unit/test_schedulers_forcesched.py b/master/buildbot/test/unit/test_schedulers_forcesched.py
@@ -381,7 +381,7 @@ def test_StringParameter(self):
                               '"hide": false, "fullName": "p1", "type": "text", "size": 10}')
 
     def test_StringParameter_Required(self):
-        self.do_ParameterTest(value=" ", expect=ValidationError,
+        self.do_ParameterTest(value=" ", expect=CollectedValidationError,
                               expectKind=Exception,
                               klass=StringParameter, required=True)