Browse Source

Use unittest.mock instead of mock

The mock third party library was needed for mock support in py2
runtimes. Since we now only support py36 and later, we can use the
standard lib unittest.mock module instead.

Change-Id: I4e885ce16080d302552217280b88b9dee3839555
changes/47/734547/2
Hervé Beraud 1 month ago
parent
commit
3e3f94e6c9
21 changed files with 24 additions and 21 deletions
  1. +0
    -1
      lower-constraints.txt
  2. +2
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_config_helper.py
  3. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_edp_engine.py
  4. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_oozie_helper.py
  5. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_plugin.py
  6. +2
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_recommendation_utils.py
  7. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_run_scripts.py
  8. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_scaling.py
  9. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_starting_scripts.py
  10. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_utils.py
  11. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/test_confighints_helper.py
  12. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_1/test_config_helper.py
  13. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_1/test_edp_engine.py
  14. +2
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_1/test_versionhandler.py
  15. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_5/test_config_helper.py
  16. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_5/test_edp_engine.py
  17. +2
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_5/test_versionhandler.py
  18. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_8_2/test_config_helper.py
  19. +1
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_8_2/test_edp_engine.py
  20. +2
    -1
      sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_8_2/test_versionhandler.py
  21. +0
    -1
      test-requirements.txt

+ 0
- 1
lower-constraints.txt View File

@@ -57,7 +57,6 @@ Mako==1.0.7
MarkupSafe==1.1.0
mccabe==0.5.3
microversion-parse==0.2.1
mock==2.0.0
monotonic==1.5
mox3==0.26.0
msgpack==0.6.1


+ 2
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_config_helper.py View File

@@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from oslo_config import cfg

from sahara.plugins import exceptions as ex


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_edp_engine.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara.plugins import base as pb
from sahara.plugins import exceptions as ex


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_oozie_helper.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara_plugin_vanilla.plugins.vanilla.hadoop2 import oozie_helper
from sahara_plugin_vanilla.tests.unit import base


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_plugin.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara.plugins import base as pb
from sahara.plugins import conductor


+ 2
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_recommendation_utils.py View File

@@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

import testtools

from sahara_plugin_vanilla.plugins.vanilla.hadoop2 import recommendations_utils


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_run_scripts.py View File

@@ -14,7 +14,7 @@
# limitations under the License.

from functools import wraps
import mock
from unittest import mock


def mock_event_wrapper(*args, **kwargs):


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_scaling.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara_plugin_vanilla.i18n import _
from sahara_plugin_vanilla.plugins.vanilla.hadoop2 import config_helper


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_starting_scripts.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara_plugin_vanilla.plugins.vanilla.hadoop2 import starting_scripts
from sahara_plugin_vanilla.tests.unit import base


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/hadoop2/test_utils.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara.plugins import utils
from sahara_plugin_vanilla.plugins.vanilla.hadoop2 import utils as u


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/test_confighints_helper.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara_plugin_vanilla.plugins.vanilla import confighints_helper
from sahara_plugin_vanilla.tests.unit import base as sahara_base


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_1/test_config_helper.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara.plugins import provisioning as p
from sahara_plugin_vanilla.plugins.vanilla.v2_7_1 import config_helper


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_1/test_edp_engine.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara.plugins import edp
from sahara_plugin_vanilla.plugins.vanilla.v2_7_1 import edp_engine


+ 2
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_1/test_versionhandler.py View File

@@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

import six
import testtools



+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_5/test_config_helper.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara.plugins import provisioning as p
from sahara_plugin_vanilla.plugins.vanilla.v2_7_5 import config_helper


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_5/test_edp_engine.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara.plugins import edp
from sahara_plugin_vanilla.plugins.vanilla.v2_7_5 import edp_engine


+ 2
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_7_5/test_versionhandler.py View File

@@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

import six
import testtools



+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_8_2/test_config_helper.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara.plugins import provisioning as p
from sahara_plugin_vanilla.plugins.vanilla.v2_8_2 import config_helper


+ 1
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_8_2/test_edp_engine.py View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

from sahara.plugins import edp
from sahara.tests.unit import base as sahara_base


+ 2
- 1
sahara_plugin_vanilla/tests/unit/plugins/vanilla/v2_8_2/test_versionhandler.py View File

@@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import mock
from unittest import mock

import six
import testtools



+ 0
- 1
test-requirements.txt View File

@@ -9,7 +9,6 @@ bashate>=0.5.1 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
doc8>=0.6.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
mock>=2.0.0 # BSD
oslotest>=3.2.0 # Apache-2.0
stestr>=1.0.0 # Apache-2.0
pylint==1.4.5 # GPLv2


Loading…
Cancel
Save