Skip to content
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 kmip/tests/unit/core/objects/test_credentials.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# under the License.

import enum
import mock
from unittest import mock
import testtools

from kmip import enums
Expand Down
3 changes: 1 addition & 2 deletions kmip/tests/unit/core/test_config_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
import ConfigParser as configparser

from testtools import TestCase
from mock import MagicMock
from mock import Mock
from unittest.mock import MagicMock, Mock

from kmip.core.config_helper import ConfigHelper

Expand Down
2 changes: 1 addition & 1 deletion kmip/tests/unit/pie/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.

import mock
from unittest import mock
import six
import ssl
import testtools
Expand Down
2 changes: 1 addition & 1 deletion kmip/tests/unit/services/server/auth/test_slugs.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.

import mock
from unittest import mock
import requests
import testtools

Expand Down
2 changes: 1 addition & 1 deletion kmip/tests/unit/services/server/auth/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from cryptography.hazmat.primitives.asymmetric import rsa

import datetime
import mock
from unittest import mock
import ssl
import testtools

Expand Down
2 changes: 1 addition & 1 deletion kmip/tests/unit/services/server/crypto/test_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.

import mock
from unittest import mock
import pytest
import testtools

Expand Down
2 changes: 1 addition & 1 deletion kmip/tests/unit/services/server/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# under the License.

import logging
import mock
from unittest import mock

import six
from six.moves import configparser
Expand Down
2 changes: 1 addition & 1 deletion kmip/tests/unit/services/server/test_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# under the License.

import six
import mock
from unittest import mock
import shutil
import sqlalchemy

Expand Down
2 changes: 1 addition & 1 deletion kmip/tests/unit/services/server/test_monitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# under the License.

import logging
import mock
from unittest import mock
import multiprocessing
import os
import shutil
Expand Down
7 changes: 1 addition & 6 deletions kmip/tests/unit/services/server/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,10 @@
# under the License.

import logging

try:
import unittest.mock as mock
except Exception:
import mock

import signal
import socket
import testtools
import unittest.mock as mock

from kmip.core import exceptions
from kmip.services import auth
Expand Down
2 changes: 1 addition & 1 deletion kmip/tests/unit/services/server/test_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


import datetime
import mock
from unittest import mock
import socket
import testtools
import time
Expand Down
2 changes: 1 addition & 1 deletion kmip/tests/unit/services/test_kmip_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
from kmip.services.results import QueryResult
from kmip.services.results import RekeyKeyPairResult

import mock
from unittest import mock
import os
import socket
import ssl
Expand Down
2 changes: 1 addition & 1 deletion kmip/tests/unit/services/test_kmip_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.

from mock import call, MagicMock
from unittest.mock import call, MagicMock
from testtools import TestCase

import binascii
Expand Down
1 change: 0 additions & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ pytest
flake8
testtools
fixtures
mock
slugs
sphinx
PyYAML
Expand Down
Loading