summaryrefslogtreecommitdiff
path: root/service/test/unit/adapter
diff options
context:
space:
mode:
authorRoald de Vries <rdevries@thoughtworks.com>2016-11-23 11:31:22 +0100
committerRoald de Vries <rdevries@thoughtworks.com>2016-11-23 11:41:24 +0100
commit6cb474e3fee165f51c414634ec88380b9a50c5fc (patch)
treea4376d40dbee481714e3a43c5db37cdba595d805 /service/test/unit/adapter
parent8d8cfea0713ea5b0375ab0dcb6bfde56fd7a2156 (diff)
replace stdlib's unittest with trials's unittest for all unittest
Diffstat (limited to 'service/test/unit/adapter')
-rw-r--r--service/test/unit/adapter/mailstore/test_body_parser.py2
-rw-r--r--service/test/unit/adapter/search/test_search.py2
-rw-r--r--service/test/unit/adapter/test_contacts.py2
-rw-r--r--service/test/unit/adapter/test_draft_service.py2
-rw-r--r--service/test/unit/adapter/test_status.py2
-rw-r--r--service/test/unit/adapter/test_tag.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/service/test/unit/adapter/mailstore/test_body_parser.py b/service/test/unit/adapter/mailstore/test_body_parser.py
index 155b326c..cff0b09e 100644
--- a/service/test/unit/adapter/mailstore/test_body_parser.py
+++ b/service/test/unit/adapter/mailstore/test_body_parser.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import unittest
+from twisted.trial import unittest
from mock import patch
from pixelated.adapter.mailstore.body_parser import BodyParser
diff --git a/service/test/unit/adapter/search/test_search.py b/service/test/unit/adapter/search/test_search.py
index be37257c..1465961d 100644
--- a/service/test/unit/adapter/search/test_search.py
+++ b/service/test/unit/adapter/search/test_search.py
@@ -16,7 +16,7 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import unittest
+from twisted.trial import unittest
from pixelated.adapter.mailstore.leap_mailstore import LeapMail
from pixelated.adapter.search import SearchEngine
from tempdir import TempDir
diff --git a/service/test/unit/adapter/test_contacts.py b/service/test/unit/adapter/test_contacts.py
index 3510faf5..83383755 100644
--- a/service/test/unit/adapter/test_contacts.py
+++ b/service/test/unit/adapter/test_contacts.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import unittest
+from twisted.trial import unittest
from pixelated.adapter.search.contacts import address_duplication_filter
from pixelated.adapter.search.contacts import extract_mail_address
diff --git a/service/test/unit/adapter/test_draft_service.py b/service/test/unit/adapter/test_draft_service.py
index c2516013..e18589eb 100644
--- a/service/test/unit/adapter/test_draft_service.py
+++ b/service/test/unit/adapter/test_draft_service.py
@@ -1,4 +1,4 @@
-import unittest
+from twisted.trial import unittest
from twisted.internet import defer
from pixelated.adapter.mailstore.leap_mailstore import LeapMail
diff --git a/service/test/unit/adapter/test_status.py b/service/test/unit/adapter/test_status.py
index 5cd0fa1e..4624dcee 100644
--- a/service/test/unit/adapter/test_status.py
+++ b/service/test/unit/adapter/test_status.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import unittest
+from twisted.trial import unittest
from pixelated.adapter.model.status import Status
diff --git a/service/test/unit/adapter/test_tag.py b/service/test/unit/adapter/test_tag.py
index a4fa819e..e6d2771d 100644
--- a/service/test/unit/adapter/test_tag.py
+++ b/service/test/unit/adapter/test_tag.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import unittest
+from twisted.trial import unittest
from pixelated.adapter.model.tag import Tag