2020-12-12 13:11:57 +01:00
|
|
|
--- a/test/test_pytest/test_flaky_pytest_plugin.py
|
|
|
|
+++ b/test/test_pytest/test_flaky_pytest_plugin.py
|
2020-12-13 21:45:22 +01:00
|
|
|
@@ -2,7 +2,10 @@
|
2020-12-12 13:11:57 +01:00
|
|
|
|
|
|
|
from __future__ import unicode_literals
|
|
|
|
from io import StringIO
|
|
|
|
-from mock import Mock, patch
|
2020-12-13 21:45:22 +01:00
|
|
|
+try:
|
|
|
|
+ from unittest.mock import Mock, patch
|
|
|
|
+except ImportError:
|
|
|
|
+ from mock import Mock, patch
|
2020-12-12 13:11:57 +01:00
|
|
|
# pylint:disable=import-error
|
|
|
|
import pytest
|
|
|
|
from _pytest.runner import CallInfo
|