summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/config_test.py4
-rw-r--r--tests/crypto_test.py3
-rw-r--r--tests/events_test.py3
-rw-r--r--tests/file_test.py3
-rw-r--r--tests/silo_test.py3
5 files changed, 11 insertions, 5 deletions
diff --git a/tests/config_test.py b/tests/config_test.py
index f69f4e6..b60cc40 100644
--- a/tests/config_test.py
+++ b/tests/config_test.py
@@ -22,7 +22,8 @@ from nose.tools import *
from os import path, remove, rmdir
from combox.config import (config_cb, get_secret, get_stdin)
-from tests.utils import get_input_func, rm_nodedirs, get_config
+from tests.utils import (get_input_func, rm_nodedirs,
+ get_config, rm_configdir)
class TestConfig(object):
@@ -59,3 +60,4 @@ class TestConfig(object):
"""Tear everything down."""
remove(self.config_file)
rm_nodedirs(get_config())
+ rm_configdir()
diff --git a/tests/crypto_test.py b/tests/crypto_test.py
index 00682b3..8cff6f9 100644
--- a/tests/crypto_test.py
+++ b/tests/crypto_test.py
@@ -27,7 +27,7 @@ from shutil import copyfile
from combox.config import get_nodedirs
from combox.crypto import *
from combox.file import *
-from tests.utils import get_config, rm_nodedirs
+from tests.utils import get_config, rm_nodedirs, rm_configdir
class TestCrypto(object):
@@ -120,3 +120,4 @@ class TestCrypto(object):
rm_shards(self.TEST_FILE, self.config)
remove(self.TEST_FILE_COPY)
rm_nodedirs(self.config)
+ rm_configdir()
diff --git a/tests/events_test.py b/tests/events_test.py
index 89b2033..5e5b13f 100644
--- a/tests/events_test.py
+++ b/tests/events_test.py
@@ -37,7 +37,7 @@ from combox.file import (relative_path, purge_dir,
from combox.silo import ComboxSilo
from tests.utils import (get_config, shardedp, dirp, renamedp,
- path_deletedp, rm_nodedirs)
+ path_deletedp, rm_nodedirs, rm_configdir)
class TestEvents(object):
@@ -242,3 +242,4 @@ class TestEvents(object):
silo.remove(self.TEST_FILE)
rm_nodedirs(self.config)
+ rm_configdir()
diff --git a/tests/file_test.py b/tests/file_test.py
index 04670f2..2c6dce0 100644
--- a/tests/file_test.py
+++ b/tests/file_test.py
@@ -27,7 +27,7 @@ from combox.config import get_nodedirs
from combox.file import (split_data, glue_data, write_file,
read_file, write_shards, read_shards,
hash_file, rm_shards)
-from tests.utils import get_config, rm_nodedirs
+from tests.utils import get_config, rm_nodedirs, rm_configdir
class TestFile(object):
@@ -101,3 +101,4 @@ class TestFile(object):
rm_shards(self.TEST_FILE, self.config)
rm_nodedirs(self.config)
+ rm_configdir()
diff --git a/tests/silo_test.py b/tests/silo_test.py
index 7e0eb40..df905b6 100644
--- a/tests/silo_test.py
+++ b/tests/silo_test.py
@@ -24,7 +24,7 @@ from os import path, remove
from combox.silo import ComboxSilo
from combox.file import read_file, write_file
-from tests.utils import get_config, rm_nodedirs
+from tests.utils import get_config, rm_nodedirs, rm_configdir
class TestSilo(object):
"""
@@ -99,3 +99,4 @@ class TestSilo(object):
csilo.remove(self.LOREM)
csilo.remove(self.IPSUM)
rm_nodedirs(self.config)
+ rm_configdir()