Merge "Revert "Make mock import python 2.7 compatible""
This commit is contained in:
commit
0ae6673343
|
@ -12,12 +12,8 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
try:
|
from unittest.mock import MagicMock
|
||||||
from unittest.mock import MagicMock
|
from unittest.mock import patch
|
||||||
from unittest.mock import patch
|
|
||||||
except ImportError:
|
|
||||||
from mock import MagicMock
|
|
||||||
from mock import patch
|
|
||||||
|
|
||||||
from validations_common.library.check_package_update import check_update
|
from validations_common.library.check_package_update import check_update
|
||||||
from validations_common.library.check_package_update import get_package_details
|
from validations_common.library.check_package_update import get_package_details
|
||||||
|
|
|
@ -23,10 +23,7 @@ Tests for `reportentry` module.
|
||||||
import validations_common.library.reportentry as validation
|
import validations_common.library.reportentry as validation
|
||||||
from validations_common.tests import base
|
from validations_common.tests import base
|
||||||
|
|
||||||
try:
|
from unittest import mock
|
||||||
from unittest import mock
|
|
||||||
except ImportError:
|
|
||||||
import mock
|
|
||||||
|
|
||||||
reason = "Reason #1"
|
reason = "Reason #1"
|
||||||
recommendation = ['Recommendation #1']
|
recommendation = ['Recommendation #1']
|
||||||
|
|
Loading…
Reference in New Issue