Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions tenacity/tests/test_tenacity.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import logging
import os
import re
import sys
import time
Expand Down Expand Up @@ -507,8 +506,8 @@ def returnval():
self.assertEqual(retry_state.kwargs, {})
self.assertEqual(retry_state.outcome.result(), 123)
self.assertEqual(retry_state.attempt_number, 1)
self.assertGreater(retry_state.outcome_timestamp,
retry_state.start_time)
self.assertGreaterEqual(retry_state.outcome_timestamp,
retry_state.start_time)

def dying():
raise Exception("Broken")
Expand All @@ -521,8 +520,8 @@ def dying():
self.assertEqual(retry_state.kwargs, {})
self.assertEqual(str(retry_state.outcome.exception()), 'Broken')
self.assertEqual(retry_state.attempt_number, 1)
self.assertGreater(retry_state.outcome_timestamp,
retry_state.start_time)
self.assertGreaterEqual(retry_state.outcome_timestamp,
retry_state.start_time)


class TestRetryConditions(unittest.TestCase):
Expand Down Expand Up @@ -1198,7 +1197,7 @@ def test_before_sleep_log_raises_with_exc_info(self):
etalon_re = re.compile(r"^Retrying .* in 0\.01 seconds as it raised "
r"(IO|OS)Error: Hi there, I'm an IOError\.{0}"
r"Traceback \(most recent call last\):{0}"
r".*$".format(os.linesep),
r".*$".format('\n'),
flags=re.MULTILINE)
self.assertEqual(len(handler.records), 2)
fmt = logging.Formatter().format
Expand Down