summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2015-09-29 11:20:38 -0400
committerSimo Sorce <simo@redhat.com>2015-10-19 12:16:52 -0400
commit5fceed2d9be1001fc486d801e0a0f923d8dd3159 (patch)
treefc51762aa859135a1ebdaa9e96c95b25a847991c /tests
parent18178ce292ae2f88528c7e6256c9956ec9ebf896 (diff)
downloadcustodia-5fceed2d9be1001fc486d801e0a0f923d8dd3159.tar.gz
custodia-5fceed2d9be1001fc486d801e0a0f923d8dd3159.tar.xz
custodia-5fceed2d9be1001fc486d801e0a0f923d8dd3159.zip
Make tox pep8 happy
Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/custodia.py10
-rw-r--r--tests/tests.py10
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()