summaryrefslogtreecommitdiff
path: root/service/test/unit/resources
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:31:22 +0100
commitced565121604f9834f83ec485538bb2e2a0c9232 (patch)
tree4a6489174088f3adceb7489b110518943aaf187e /service/test/unit/resources
parent819d3b0c974fe1b937adbdc5205d7810b88faa4e (diff)
replace stdlib's unittest with trials's unittest for all unittest
Diffstat (limited to 'service/test/unit/resources')
-rw-r--r--service/test/unit/resources/test_attachments_resource.py2
-rw-r--r--service/test/unit/resources/test_helpers.py2
-rw-r--r--service/test/unit/resources/test_sandbox_resource.py2
-rw-r--r--service/test/unit/resources/test_user_settings_resource.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/service/test/unit/resources/test_attachments_resource.py b/service/test/unit/resources/test_attachments_resource.py
index 06ae765f..15f38406 100644
--- a/service/test/unit/resources/test_attachments_resource.py
+++ b/service/test/unit/resources/test_attachments_resource.py
@@ -1,5 +1,5 @@
import json
-import unittest
+from twisted.trial import unittest
from mock import patch, MagicMock
from mockito import mock, when, verify, any as ANY
diff --git a/service/test/unit/resources/test_helpers.py b/service/test/unit/resources/test_helpers.py
index a17ce755..25a52da2 100644
--- a/service/test/unit/resources/test_helpers.py
+++ b/service/test/unit/resources/test_helpers.py
@@ -1,4 +1,4 @@
-import unittest
+from twisted.trial import unittest
import re
from pixelated.resources import respond_json, respond_json_deferred
diff --git a/service/test/unit/resources/test_sandbox_resource.py b/service/test/unit/resources/test_sandbox_resource.py
index 98b88b2d..4f263af1 100644
--- a/service/test/unit/resources/test_sandbox_resource.py
+++ b/service/test/unit/resources/test_sandbox_resource.py
@@ -1,5 +1,5 @@
import os
-import unittest
+from twisted.trial import unittest
from twisted.internet import defer
from twisted.web.test.requesthelper import DummyRequest
diff --git a/service/test/unit/resources/test_user_settings_resource.py b/service/test/unit/resources/test_user_settings_resource.py
index 30a3c4cd..e9748e72 100644
--- a/service/test/unit/resources/test_user_settings_resource.py
+++ b/service/test/unit/resources/test_user_settings_resource.py
@@ -1,4 +1,4 @@
-import unittest
+from twisted.trial import unittest
import json
import ast