Added check for ints for caches and added a test.

djmitche · May 31, 2012 · 5b22df9 · 5b22df9
1 parent bee6af8
commit 5b22df9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/master/buildbot/config.py b/master/buildbot/config.py
@@ -361,10 +361,11 @@ def load_caches(self, filename, config_dict, errors):
             if not isinstance(caches, dict):
                 errors.addError("c['caches'] must be a dictionary")
             else:
-                vals = caches.values()
-                for x in vals:
-                  if (not isinstance(x, int)):
-                     errors.addError("value must be an int")
+                valPairs = caches.items()
+                for (x, y) in valPairs:
+                  if (not isinstance(y, int)):
+                     errors.addError(
+		     "value for cache size '%s' must be an integer" % x)
                 self.caches.update(caches)
 
         if 'buildCacheSize' in config_dict:

diff --git a/master/buildbot/test/unit/test_config.py b/master/buildbot/test/unit/test_config.py
@@ -550,7 +550,8 @@ def test_load_caches_entries_test(self):
         self.cfg.load_caches(self.filename,
                 dict(caches=dict(foo="1")),
                 self.errors)
-        self.assertConfigError(self.errors, "must be an int")
+        self.assertConfigError(self.errors,
+	                       "value for cache size 'foo' must be an integer")
 
     def test_load_schedulers_defaults(self):
         self.cfg.load_schedulers(self.filename, {}, self.errors)