diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/custodia.py | 10 | ||||
| -rw-r--r-- | tests/tests.py | 10 |
2 files changed, 13 insertions, 7 deletions
diff --git a/tests/custodia.py b/tests/custodia.py index e14f091..f536dc3 100644 --- a/tests/custodia.py +++ b/tests/custodia.py @@ -1,13 +1,15 @@ # Copyright (C) 2015 Custodia Project Contributors - see LICENSE file from __future__ import absolute_import -from tests.client import LocalConnection + import json import os import subprocess import time import unittest +from tests.client import LocalConnection + class CustodiaTests(unittest.TestCase): @@ -25,9 +27,9 @@ class CustodiaTests(unittest.TestCase): 'Content-Type': 'application/json'} @classmethod - def tearDownClass(self): - self.custodia_process.kill() - self.custodia_process.wait() + def tearDownClass(cls): + cls.custodia_process.kill() + cls.custodia_process.wait() for fname in ['server_socket', 'secrets.db']: try: os.unlink(fname) diff --git a/tests/tests.py b/tests/tests.py index 5a2837e..02a3268 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -1,9 +1,13 @@ from __future__ import absolute_import + +import unittest + +from tests.custodia import CustodiaTests + +from custodia.message.kem import KEMTests from custodia.secrets import SecretsTests from custodia.store.sqlite import SqliteStoreTests -from custodia.message.kem import KEMTests -from tests.custodia import CustodiaTests -import unittest + if __name__ == '__main__': testLoad = unittest.TestLoader() |