From 3add623ac9c42918693f3f48aa492285426703e4 Mon Sep 17 00:00:00 2001
From: jleute <julia.leute@gmail.com>
Date: Sat, 19 May 2018 02:42:45 +0200
Subject: [PATCH] clean up temporary conf file

---
 lbrynet/tests/unit/test_conf.py | 12 +++++++++---
 lbrynet/tests/util.py           |  5 ++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lbrynet/tests/unit/test_conf.py b/lbrynet/tests/unit/test_conf.py
index 9159244ec..aedf4f6cc 100644
--- a/lbrynet/tests/unit/test_conf.py
+++ b/lbrynet/tests/unit/test_conf.py
@@ -5,7 +5,7 @@ from twisted.trial import unittest
 from lbrynet import conf
 from lbrynet.core.Error import InvalidCurrencyError
 from lbrynet.tests import mocks
-from lbrynet.tests.util import create_conf_file
+from lbrynet.tests.util import create_conf_file, remove_conf_file
 
 class SettingsTest(unittest.TestCase):
     def setUp(self):
@@ -84,7 +84,7 @@ class SettingsTest(unittest.TestCase):
         conf_entry = 'lbryum_servers: ["localhost:50001", "localhost:50002"]\n'
         conf_temp = create_conf_file(conf_entry)
         conf.conf_file = conf_temp
-        adjustable_settings={'data_dir': (str, conf.default_data_dir),
+        adjustable_settings = {'data_dir': (str, conf.default_data_dir),
                 'lbryum_servers': (list, [('localhost', 5001)],
                     conf.server_list, conf.server_list_reverse)}
         env = conf.Env(**adjustable_settings)
@@ -93,6 +93,12 @@ class SettingsTest(unittest.TestCase):
         settings.load_conf_file_settings()
         first = settings.get('lbryum_servers', data_type=conf.TYPE_PERSISTED)
         settings.save_conf_file_settings()
-        settings.load_conf_file_settings()
+        try:
+            settings.load_conf_file_settings()
+        except Exception, e:
+            remove_conf_file(conf_temp)
+            raise Exception(e)
         second = settings.get('lbryum_servers', data_type=conf.TYPE_PERSISTED)
+        remove_conf_file(conf_temp)
         self.assertEqual(first, second)
+
diff --git a/lbrynet/tests/util.py b/lbrynet/tests/util.py
index 45e4f3a15..9edd70900 100644
--- a/lbrynet/tests/util.py
+++ b/lbrynet/tests/util.py
@@ -22,7 +22,10 @@ log = logging.getLogger("lbrynet.tests.util")
 def create_conf_file(entry):
     with tempfile.NamedTemporaryFile(delete=False, suffix='.yml') as conf:
         conf.write(entry)
-        return conf.name
+    return conf.name
+
+def remove_conf_file(filename):
+    os.remove(filename)
 
 def mk_db_and_blob_dir():
     db_dir = tempfile.mkdtemp()