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, 28 insertions, 11 deletions

diff --git a/tests/test_trapd_runtime_pid.py b/tests/test_trapd_runtime_pid.py
index 61900ba..222ce58 100644
--- a/tests/test_trapd_runtime_pid.py
+++ b/tests/test_trapd_runtime_pid.py
@@ -1,35 +1,52 @@
+# ============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 trapd_runtime_pid
 import sys
-#from /home/ubuntu/HB_Nov5/miss_htbt_service/mod/ import trapd_io
-import trapd_runtime_pid
-import trapd_io 
+from miss_htbt_service.mod import trapd_runtime_pid
+from miss_htbt_service.mod import trapd_io
 
 class test_save_pid(unittest.TestCase):
     """
     Test the save_pid mod
     """
- 
+
     def test_correct_usage(self):
         """
         Test that attempt to create pid file in standard location works
         """
         result = trapd_runtime_pid.save_pid('/tmp/snmptrap_test_pid_file')
         self.assertEqual(result, True)
- 
+
     def test_missing_directory(self):
         """
         Test that attempt to create pid file in missing dir fails
         """
         result = trapd_runtime_pid.save_pid('/bogus/directory/for/snmptrap_test_pid_file')
         self.assertEqual(result, False)
- 
+
 class test_rm_pid(unittest.TestCase):
     """
     Test the rm_pid mod
     """
- 
+
     def test_correct_usage(self):
         """
         Test that attempt to remove pid file in standard location works
@@ -39,14 +56,14 @@ class test_rm_pid(unittest.TestCase):
         self.assertEqual(result, True)
         result = trapd_runtime_pid.rm_pid('/tmp/snmptrap_test_pid_file')
         self.assertEqual(result, True)
- 
+
     def test_missing_file(self):
         """
         Test that attempt to rm non-existent pid file fails
         """
         result = trapd_runtime_pid.rm_pid('/tmp/snmptrap_test_pid_file_9999')
         self.assertEqual(result, False)
- 
- 
+
+
 #if __name__ == '__main__':
 #    unittest.main()