1 files changed, 12 insertions, 36 deletions
diff --git a/tests/test_trapd_settings.py b/tests/test_trapd_settings.py
index 92a3144..5625d78 100644
--- a/tests/test_trapd_settings.py
+++ b/tests/test_trapd_settings.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2019-2021 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2022 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-import pytest
 import unittest
 import trapd_exit
 
@@ -24,66 +23,43 @@ pid_file_dne = "/tmp/test_pid_file_NOT"
 import trapd_settings as tds
 
 
-class test_cleanup_and_exit(unittest.TestCase):
+class test_trapd_settings(unittest.TestCase):
     """
     Test for presense of required vars
     """
 
+    @classmethod
+    def setUpClass(cls):
+        tds.init()
+
+
     def test_nonexistent_dict(self):
         """
         Test nosuch var
         """
-        tds.init()
-        try:
-            tds.no_such_var
-            result = True
-        except:
-            result = False
+        self.assertFalse(hasattr(tds, 'no_such_var'))
 
-        self.assertEqual(result, False)
 
     def test_config_dict(self):
         """
         Test config dict
         """
-        tds.init()
-        try:
-            tds.c_config
-            result = True
-        except:
-            result = False
+        self.assertTrue(hasattr(tds, 'c_config'))
 
-        self.assertEqual(result, True)
 
     def test_dns_cache_ip_to_name(self):
         """
         Test dns cache name dict
         """
+        self.assertTrue(hasattr(tds, 'dns_cache_ip_to_name'))
 
-        tds.init()
-        try:
-            tds.dns_cache_ip_to_name
-            result = True
-        except:
-            result = False
-
-        self.assertEqual(result, True)
 
     def test_dns_cache_ip_expires(self):
         """
         Test dns cache ip expires dict
         """
-
-        tds.init()
-        try:
-            tds.dns_cache_ip_expires
-            result = True
-        except:
-            result = False
-
-        self.assertEqual(result, True)
+        self.assertTrue(hasattr(tds, 'dns_cache_ip_expires'))
 
 
-if __name__ == "__main__":
-    # tds.init()
+if __name__ == "__main__": # pragma: no cover
     unittest.main()