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

prefer newer unittest.mock when available #42

Open
wants to merge 1 commit into
base: upstream
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
5 changes: 4 additions & 1 deletion tests/test_datacontainer.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
"""
import configobj
import pytest
import mock
import unittest
import time
try: import simplejson as json
except ImportError: import json
import socket
try:
from unittest import mock
except ImportError:
import mock

import sys
import os
Expand Down
5 changes: 4 additions & 1 deletion tests/test_memory_leak.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
"""
import configobj
import pytest
import mock
import unittest
try:
from unittest import mock
except ImportError:
import mock

import resource
import sys
Expand Down
5 changes: 4 additions & 1 deletion tests/test_sampleprobe.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
"""
import configobj
import pytest
import mock
import unittest
import socket
try:
from unittest import mock
except ImportError:
import mock

import resource
import time
Expand Down
5 changes: 4 additions & 1 deletion tests/test_senderprotocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
"""
import configobj
import pytest
import mock
import unittest
import time
try: import simplejson as json
except ImportError: import json
import socket
try:
from unittest import mock
except ImportError:
import mock

import sys
import os
Expand Down
5 changes: 4 additions & 1 deletion tests/test_zabbixagentconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
"""
import configobj
import pytest
import mock
import unittest
import logging
try:
from unittest import mock
except ImportError:
import mock

import sys
import os
Expand Down