Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tests: mock is now part of unittest #1437

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion tests/entrypoints/test_alias.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from mock import Mock
from unittest.mock import Mock
import pytest
from thefuck.entrypoints.alias import _get_alias, print_alias

Expand Down
2 changes: 1 addition & 1 deletion tests/entrypoints/test_fix_command.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from mock import Mock
from unittest.mock import Mock
from thefuck.entrypoints.fix_command import _get_raw_command


Expand Down
2 changes: 1 addition & 1 deletion tests/entrypoints/test_not_configured.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest
import json
from six import StringIO
from mock import MagicMock
from unittest.mock import MagicMock
from thefuck.shells.generic import ShellConfiguration
from thefuck.entrypoints.not_configured import main

Expand Down
2 changes: 1 addition & 1 deletion tests/output_readers/test_rerun.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest
import sys
from mock import Mock, patch
from unittest.mock import Mock, patch
from psutil import AccessDenied, TimeoutExpired

from thefuck.output_readers import rerun
Expand Down
2 changes: 1 addition & 1 deletion tests/rules/test_has_exists_script.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from mock import patch
from unittest.mock import patch
from thefuck.rules.has_exists_script import match, get_new_command
from thefuck.types import Command

Expand Down
2 changes: 1 addition & 1 deletion tests/rules/test_pacman.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from mock import patch
from unittest.mock import patch
from thefuck.rules import pacman
from thefuck.rules.pacman import match, get_new_command
from thefuck.types import Command
Expand Down
2 changes: 1 addition & 1 deletion tests/rules/test_pacman_not_found.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from mock import patch
from unittest.mock import patch
from thefuck.rules import pacman_not_found
from thefuck.rules.pacman_not_found import match, get_new_command
from thefuck.types import Command
Expand Down
2 changes: 1 addition & 1 deletion tests/test_conf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest
import six
import os
from mock import Mock
from unittest.mock import Mock
from thefuck import const


Expand Down
2 changes: 1 addition & 1 deletion tests/test_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import os
from subprocess import PIPE, STDOUT
from mock import Mock
from unittest.mock import Mock
import pytest
from tests.utils import CorrectedCommand, Rule
from thefuck import const
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest
import warnings
from mock import Mock, call, patch
from unittest.mock import Mock, call, patch
from thefuck.utils import default_settings, \
memoize, get_closest, get_all_executables, replace_argument, \
get_all_matched_commands, is_app, for_app, cache, \
Expand Down