Merge madazone/buildbot:stringparameter-required-test (PR #1084)

buildbot · Mar 14, 2014 · dd9848b · dd9848b
2 parents fe57891 + 2412a43
commit dd9848b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/master/buildbot/schedulers/forcesched.py b/master/buildbot/schedulers/forcesched.py
@@ -92,6 +92,12 @@ def getFromKwargs(self, kwargs):
            the optional regex field and calls 'parse_from_args' for the final conversion.
         """
         args = kwargs.get(self.fullName, [])
+
+        # delete white space for args
+        for arg in args:
+            if not arg.strip():
+                args.remove(arg)
+
         if len(args) == 0:
             if self.required:
                 raise ValidationError("'%s' needs to be specified" % (self.label))

diff --git a/master/buildbot/test/unit/test_schedulers_forcesched.py b/master/buildbot/test/unit/test_schedulers_forcesched.py
@@ -366,6 +366,11 @@ def test_StringParameter(self):
         self.do_ParameterTest(value="testedvalue", expect="testedvalue",
                               klass=StringParameter)
 
+    def test_StringParameter_Required(self):
+        self.do_ParameterTest(value=" ", expect=ValidationError,
+                              expectKind=Exception,
+                              klass=StringParameter, required=True)
+
     def test_IntParameter(self):
         self.do_ParameterTest(value="123", expect=123, klass=IntParameter)