Merge lp:~billy-olsen/charm-helpers/lp1602444 into lp:charm-helpers

[Billy Olsen]

[David Ames (thedac)]

Looks good to me. Merging.

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2016-07-12 18:23:03 +0000
+++ charmhelpers/contrib/openstack/context.py	2016-07-12 23:06:41 +0000
@@ -1196,7 +1196,10 @@
 
     def __call__(self):
         multiplier = config('worker-multiplier') or 0
-        ctxt = {"workers": self.num_cpus * multiplier}
+        count = int(self.num_cpus * multiplier)
+        if multiplier > 0 and count == 0:
+            count = 1
+        ctxt = {"workers": count}
         return ctxt
 
 

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2016-07-05 22:41:39 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2016-07-12 23:06:41 +0000
@@ -2451,6 +2451,33 @@
         worker = context.WorkerConfigContext()
         self.assertTrue(worker.num_cpus, 2)
 
+    def test_workerconfig_context_float(self):
+        self.config.side_effect = fake_config({
+            'worker-multiplier': 0.3
+        })
+        with patch.object(context.WorkerConfigContext, 'num_cpus', 4):
+            worker = context.WorkerConfigContext()
+            self.assertTrue(worker.num_cpus, 1)
+
+    def test_workerconfig_context_not_quite_0(self):
+        # Make sure that the multiplier evaluating to somewhere between
+        # 0 and 1 in the floating point range still has at least one
+        # worker.
+        self.config.side_effect = fake_config({
+            'worker-multiplier': 0.001
+        })
+        with patch.object(context.WorkerConfigContext, 'num_cpus', 100):
+            worker = context.WorkerConfigContext()
+            self.assertTrue(worker.num_cpus, 1)
+
+    def test_workerconfig_context_0(self):
+        self.config.side_effect = fake_config({
+            'worker-multiplier': 0
+        })
+        with patch.object(context.WorkerConfigContext, 'num_cpus', 2):
+            worker = context.WorkerConfigContext()
+            self.assertTrue(worker.num_cpus, 0)
+
     def test_workerconfig_context_noconfig(self):
         self.config.return_value = None
         with patch.object(context.WorkerConfigContext, 'num_cpus', 2):