Fix retry.with_delay multiplier parameter handling (googleapis#164)

quentin-sommer · web-flow · commit 1647f07c7ddb · 2021-03-31T16:52:02.000Z
Issue: googleapis#163
diff --git a/google/api_core/retry.py b/google/api_core/retry.py
@@ -345,7 +345,7 @@ def with_delay(self, initial=None, maximum=None, multiplier=None):
             predicate=self._predicate,
             initial=initial if initial is not None else self._initial,
             maximum=maximum if maximum is not None else self._maximum,
-            multiplier=multiplier if maximum is not None else self._multiplier,
+            multiplier=multiplier if multiplier is not None else self._multiplier,
             deadline=self._deadline,
             on_error=self._on_error,
         )
diff --git a/tests/unit/test_retry.py b/tests/unit/test_retry.py
@@ -246,12 +246,44 @@ def test_with_delay(self):
             deadline=4,
             on_error=mock.sentinel.on_error,
         )
-        new_retry = retry_.with_delay(initial=1, maximum=2, multiplier=3)
+        new_retry = retry_.with_delay(initial=5, maximum=6, multiplier=7)
         assert retry_ is not new_retry
-        assert new_retry._initial == 1
+        assert new_retry._initial == 5
+        assert new_retry._maximum == 6
+        assert new_retry._multiplier == 7
+
+        # the rest of the attributes should remain the same
+        assert new_retry._deadline == retry_._deadline
+        assert new_retry._predicate is retry_._predicate
+        assert new_retry._on_error is retry_._on_error
+
+    def test_with_delay_partial_options(self):
+        retry_ = retry.Retry(
+            predicate=mock.sentinel.predicate,
+            initial=1,
+            maximum=2,
+            multiplier=3,
+            deadline=4,
+            on_error=mock.sentinel.on_error,
+        )
+        new_retry = retry_.with_delay(initial=4)
+        assert retry_ is not new_retry
+        assert new_retry._initial == 4
         assert new_retry._maximum == 2
         assert new_retry._multiplier == 3
 
+        new_retry = retry_.with_delay(maximum=4)
+        assert retry_ is not new_retry
+        assert new_retry._initial == 1
+        assert new_retry._maximum == 4
+        assert new_retry._multiplier == 3
+
+        new_retry = retry_.with_delay(multiplier=4)
+        assert retry_ is not new_retry
+        assert new_retry._initial == 1
+        assert new_retry._maximum == 2
+        assert new_retry._multiplier == 4
+
         # the rest of the attributes should remain the same
         assert new_retry._deadline == retry_._deadline
         assert new_retry._predicate is retry_._predicate

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ def with_delay(self, initial=None, maximum=None, multiplier=None):`
`345`	`345`	`predicate=self._predicate,`
`346`	`346`	`initial=initial if initial is not None else self._initial,`
`347`	`347`	`maximum=maximum if maximum is not None else self._maximum,`
`348`		`- multiplier=multiplier if maximum is not None else self._multiplier,`
	`348`	`+ multiplier=multiplier if multiplier is not None else self._multiplier,`
`349`	`349`	`deadline=self._deadline,`
`350`	`350`	`on_error=self._on_error,`
`351`	`351`	`)`