Merge pull request #22551 from basepi/test.fib

Make test.fib much more naive

salt/modules/test.py

@@ -253,8 +253,10 @@ def arg_repr(*args, **kwargs):
 
 def fib(num):
     '''
-    Return a Fibonacci sequence up to but not including the passed number,
+    Return the num-th Fibonacci number, and the time it took to compute in
-    and the time it took to compute in seconds. Used for performance tests.
+    seconds. Used for performance tests.
+
+    This function is designed to have terrible performance.
 
     CLI Example:
 
@@ -264,12 +266,18 @@ def fib(num):
     '''
     num = int(num)
     start = time.time()
-    fib_a, fib_b = 0, 1
+    if num < 2:
-    ret = [0]
+        return num, time.time() - start
-    while fib_b < num:
+    return _fib(num-1) + _fib(num-2), time.time() - start
-        ret.append(fib_b)
+
-        fib_a, fib_b = fib_b, fib_a + fib_b
+
-    return ret, time.time() - start
+def _fib(num):
+    '''
+    Helper method for test.fib, doesn't calculate the time.
+    '''
+    if num < 2:
+        return num
+    return _fib(num-1) + _fib(num-2)
 
 
 def collatz(start):

tests/integration/client/syndic.py

@@ -28,9 +28,9 @@ class TestSyndic(integration.SyndicCase):
         self.assertEqual(
                 self.run_function(
                     'test.fib',
-                    ['40'],
+                    ['20'],
-                    )[0][-1],
+                    )[0],
-                34
+                6765
                 )
 
 

tests/integration/modules/publish.py

@@ -88,10 +88,10 @@ class PublishModuleTest(integration.ModuleCase,
         '''
         ret = self.run_function(
             'publish.full_data',
-            ['minion', 'test.fib', 40]
+            ['minion', 'test.fib', 20]
         )
         self.assertTrue(ret)
-        self.assertEqual(ret['minion']['ret'][0][-1], 34)
+        self.assertEqual(ret['minion']['ret'][0], 6765)
 
     def test_kwarg(self):
         '''

tests/integration/modules/test.py

@@ -73,9 +73,9 @@ class TestModuleTest(integration.ModuleCase,
         self.assertEqual(
                 self.run_function(
                     'test.fib',
-                    ['40'],
+                    ['20'],
-                    )[0][-1],
+                    )[0],
-                34
+                6765
                 )
 
     def test_collatz(self):

tests/integration/shell/call.py

@@ -34,10 +34,6 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
         out = self.run_call('-l quiet test.fib 3')
 
         expect = ['local:',
-                  '    |_',
-                  '      - 0',
-                  '      - 1',
-                  '      - 1',
                   '    - 2']
         self.assertEqual(expect, out[:-1])
 
@@ -45,7 +41,7 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
         out = self.run_call('-l quiet --out txt test.fib 3')
 
         expect = [
-            'local: ([0, 1, 1, 2]'
+            'local: (2'
         ]
 
         self.assertEqual(''.join(expect), ''.join(out).rsplit(",", 1)[0])