summaryrefslogtreecommitdiff
path: root/service/test/unit/support
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/support
parent8d8cfea0713ea5b0375ab0dcb6bfde56fd7a2156 (diff)
replace stdlib's unittest with trials's unittest for all unittest
Diffstat (limited to 'service/test/unit/support')
-rw-r--r--service/test/unit/support/mail_generator_test.py2
-rw-r--r--service/test/unit/support/test_encrypted_file_storage.py2
-rw-r--r--service/test/unit/support/test_functional.py2
-rw-r--r--service/test/unit/support/test_markov.py2
-rw-r--r--service/test/unit/support/test_replier.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/service/test/unit/support/mail_generator_test.py b/service/test/unit/support/mail_generator_test.py
index 9d604378..dd6da522 100644
--- a/service/test/unit/support/mail_generator_test.py
+++ b/service/test/unit/support/mail_generator_test.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/>.
from mailbox import mbox
-import unittest
+from twisted.trial import unittest
import pkg_resources
import random
from mock import patch
diff --git a/service/test/unit/support/test_encrypted_file_storage.py b/service/test/unit/support/test_encrypted_file_storage.py
index 69b82f3d..8083430e 100644
--- a/service/test/unit/support/test_encrypted_file_storage.py
+++ b/service/test/unit/support/test_encrypted_file_storage.py
@@ -15,7 +15,7 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
import os
import shutil
-import unittest
+from twisted.trial import unittest
from pixelated.support.encrypted_file_storage import EncryptedFileStorage
diff --git a/service/test/unit/support/test_functional.py b/service/test/unit/support/test_functional.py
index ad3cb16c..0b117032 100644
--- a/service/test/unit/support/test_functional.py
+++ b/service/test/unit/support/test_functional.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU Affero General Public License
-import unittest
+from twisted.trial import unittest
from pixelated.support.functional import to_unicode
diff --git a/service/test/unit/support/test_markov.py b/service/test/unit/support/test_markov.py
index f0b0277d..911cef30 100644
--- a/service/test/unit/support/test_markov.py
+++ b/service/test/unit/support/test_markov.py
@@ -15,7 +15,7 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import unittest
+from twisted.trial import unittest
from pixelated.support.markov import MarkovGenerator
import random
diff --git a/service/test/unit/support/test_replier.py b/service/test/unit/support/test_replier.py
index 5e1c234a..ef9b321c 100644
--- a/service/test/unit/support/test_replier.py
+++ b/service/test/unit/support/test_replier.py
@@ -1,4 +1,4 @@
-import unittest
+from twisted.trial import unittest
from pixelated.support import replier