Fix relative imports and invalid exception handling

Make proper relative or absolute imports within miss_htbt_service.
Use proper except Class as variable syntax.
Avoid multiple parameters to print() for potential python2 usage.
Add missing original AT&T license text to test modules.
Add attribution to commiter's employer to modified files.
Trailing whitespace fixes.

Signed-off-by: Miroslav Los <miroslav.los@pantheon.tech>
Issue-ID: DCAEGEN2-1939
Change-Id: Ibfc4bea3e33a512d06a41050ba5e591121eb9454

1 files changed, 27 insertions, 7 deletions

diff --git a/tests/test_trapd_settings.py b/tests/test_trapd_settings.py
index 05b4449..53b24c8 100644
--- a/tests/test_trapd_settings.py
+++ b/tests/test_trapd_settings.py
@@ -1,17 +1,37 @@
+# ============LICENSE_START=======================================================
+# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019 Pantheon.tech. 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
 import pytest
 import unittest
-import test_trapd_exit
+
+from miss_htbt_service.mod import trapd_settings as tds
+
 
 pid_file="/tmp/test_pid_file"
 pid_file_dne="/tmp/test_pid_file_NOT"
 
-import trapd_settings as tds
 
 class test_cleanup_and_exit(unittest.TestCase):
     """
     Test for presense of required vars
     """
- 
+
 
     def test_nonexistent_dict(self):
         """
@@ -25,7 +45,7 @@ class test_cleanup_and_exit(unittest.TestCase):
             result = False
 
         self.assertEqual(result, False)
- 
+
     def test_config_dict(self):
         """
         Test config dict
@@ -37,10 +57,10 @@ class test_cleanup_and_exit(unittest.TestCase):
         except:
             result = False
         self.assertEqual(result, True)
- 
+
     def test_dns_cache_ip_to_name(self):
         """
-        Test dns cache name dict 
+        Test dns cache name dict
         """
 
         tds.init()
@@ -53,7 +73,7 @@ class test_cleanup_and_exit(unittest.TestCase):
 
     def test_dns_cache_ip_expires(self):
         """
-        Test dns cache ip expires dict 
+        Test dns cache ip expires dict
         """
 
         tds.init()