Merge pull request dmwm#4549 from dballesteros7/fixSplitter

Fix cases where performance parameters are None
tsarangi · Apr 26, 2013 · 489f9cd · 489f9cd
2 parents 624db67 + b429b40
commit 489f9cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/python/WMCore/JobSplitting/JobFactory.py b/src/python/WMCore/JobSplitting/JobFactory.py
@@ -408,7 +408,7 @@ def getPerformanceParameters(self, defaultParams):
         It returns a tuple with the following values:
         timePerEvent, sizePerEvent, memoryRequirement
         """
-        timePerEvent = defaultParams.get('timePerEvent', 0)
-        sizePerEvent = defaultParams.get('sizePerEvent', 0)
-        memory = defaultParams.get('memoryRequirement', 0)
+        timePerEvent = defaultParams.get('timePerEvent', None) or 0
+        sizePerEvent = defaultParams.get('sizePerEvent', None) or 0
+        memory = defaultParams.get('memoryRequirement', None) or 0
         return timePerEvent, sizePerEvent, memory
diff --git a/test/python/WMCore_t/JobSplitting_t/EventBased_t.py b/test/python/WMCore_t/JobSplitting_t/EventBased_t.py
@@ -61,7 +61,7 @@ def setUp(self):
                                                   split_algo = "EventBased",
                                                   type = "Processing")
 
-        self.performanceParams = {'timePerEvent' : 12,
+        self.performanceParams = {'timePerEvent' : None,
                                   'memoryRequirement' : 2300,
                                   'sizePerEvent' : 400}