From eb0158c35a73c91f776c88ff0c9375c71dc9f4e8 Mon Sep 17 00:00:00 2001 From: Mathieu Bultel Date: Wed, 1 Apr 2020 15:54:28 +0200 Subject: [PATCH] Make mock import python 2.7 compatible In python3.x mock is now part of unittest library. For being still compatible with python 2.7 we need to catch import error when trying to import unittest.mock Change-Id: I6aca21bea4f1563e1f3c5ecfb91c511191eb409b --- validations_libs/tests/test_ansible.py | 5 ++++- validations_libs/tests/test_utils.py | 5 ++++- validations_libs/tests/test_validations_list.py | 5 ++++- validations_libs/tests/test_validations_run.py | 5 ++++- validations_libs/tests/test_validations_show.py | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/validations_libs/tests/test_ansible.py b/validations_libs/tests/test_ansible.py index 89225f4c..59258925 100644 --- a/validations_libs/tests/test_ansible.py +++ b/validations_libs/tests/test_ansible.py @@ -13,7 +13,10 @@ # under the License. # -from unittest import mock +try: + from unittest import mock +except ImportError: + import mock from unittest import TestCase from ansible_runner import Runner diff --git a/validations_libs/tests/test_utils.py b/validations_libs/tests/test_utils.py index fb748538..b1a03be0 100644 --- a/validations_libs/tests/test_utils.py +++ b/validations_libs/tests/test_utils.py @@ -13,7 +13,10 @@ # under the License. # -from unittest import mock +try: + from unittest import mock +except ImportError: + import mock from unittest import TestCase from validations_libs import utils diff --git a/validations_libs/tests/test_validations_list.py b/validations_libs/tests/test_validations_list.py index 3e30cf04..a5cf5a5b 100644 --- a/validations_libs/tests/test_validations_list.py +++ b/validations_libs/tests/test_validations_list.py @@ -13,7 +13,10 @@ # under the License. # -from unittest import mock +try: + from unittest import mock +except ImportError: + import mock from unittest import TestCase from validations_libs.tests import fakes diff --git a/validations_libs/tests/test_validations_run.py b/validations_libs/tests/test_validations_run.py index 2749c0d0..416a141d 100644 --- a/validations_libs/tests/test_validations_run.py +++ b/validations_libs/tests/test_validations_run.py @@ -13,7 +13,10 @@ # under the License. # -from unittest import mock +try: + from unittest import mock +except ImportError: + import mock from unittest import TestCase from validations_libs.tests import fakes diff --git a/validations_libs/tests/test_validations_show.py b/validations_libs/tests/test_validations_show.py index 516a20b5..9f4a44de 100644 --- a/validations_libs/tests/test_validations_show.py +++ b/validations_libs/tests/test_validations_show.py @@ -13,7 +13,10 @@ # under the License. # -from unittest import mock +try: + from unittest import mock +except ImportError: + import mock from unittest import TestCase from validations_libs.tests import fakes