Commit 8dea5c16 authored by Tom Niget's avatar Tom Niget Committed by Julien Muchembled

Tests expect a clean work directory, otherwise weird behavior will occur

parent 14d94398
...@@ -29,12 +29,12 @@ class TestRegistryClientInteract(unittest.TestCase): ...@@ -29,12 +29,12 @@ class TestRegistryClientInteract(unittest.TestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
re6st_wrap.initial()
# if running in net ns, set lo up # if running in net ns, set lo up
subprocess.check_call(("ip", "link", "set", "lo", "up")) subprocess.check_call(("ip", "link", "set", "lo", "up"))
def setUp(self): def setUp(self):
re6st_wrap.initial()
self.port = 18080 self.port = 18080
self.url = "http://localhost:{}/".format(self.port) self.url = "http://localhost:{}/".format(self.port)
# not important, used in network_config check # not important, used in network_config check
......
...@@ -29,8 +29,9 @@ RE6ST_CONF = PYTHON + " -m re6st.cli.conf" ...@@ -29,8 +29,9 @@ RE6ST_CONF = PYTHON + " -m re6st.cli.conf"
def initial(): def initial():
"""create the workplace""" """create the workplace"""
if not WORK_DIR.exists(): if WORK_DIR.exists():
WORK_DIR.mkdir() shutil.rmtree(str(WORK_DIR))
WORK_DIR.mkdir()
def ip_to_serial(ip6): def ip_to_serial(ip6):
"""convert ipv6 address to serial""" """convert ipv6 address to serial"""
......
...@@ -57,6 +57,8 @@ class TestNet(unittest.TestCase): ...@@ -57,6 +57,8 @@ class TestNet(unittest.TestCase):
def setUpClass(cls): def setUpClass(cls):
"""create work dir""" """create work dir"""
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
def setUp(self):
re6st_wrap.initial() re6st_wrap.initial()
def deploy_re6st(self, nm, recreate=False): def deploy_re6st(self, nm, recreate=False):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment