diff options
author | Miroslav Los <miroslav.los@pantheon.tech> | 2019-11-20 16:01:08 +0100 |
---|---|---|
committer | Miroslav Los <miroslav.los@pantheon.tech> | 2019-11-25 15:48:58 +0100 |
commit | be8eee466a5d17a4cf556ad42871b2437540f6d2 (patch) | |
tree | b9512fd7f33586c0f1ba7f57fbd1d7f317fdd0da /tests/test_trapd_exit.py | |
parent | fff7569a78c830f50ccefe4b84c768a4eb40d187 (diff) |
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
Diffstat (limited to 'tests/test_trapd_exit.py')
-rw-r--r-- | tests/test_trapd_exit.py | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/tests/test_trapd_exit.py b/tests/test_trapd_exit.py index d73fd62..4fa8586 100644 --- a/tests/test_trapd_exit.py +++ b/tests/test_trapd_exit.py @@ -1,22 +1,41 @@ +# ============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 sys -import trapd_exit +from miss_htbt_service.mod import trapd_exit pid_file="/tmp/test_pid_file" pid_file_dne="/tmp/test_pid_file_NOT" - + class test_cleanup_and_exit(unittest.TestCase): """ Test the cleanup_and_exit mod """ - + def test_normal_exit(self): """ Test normal exit works as expected """ open(pid_file, 'w') - + with pytest.raises(SystemExit) as pytest_wrapped_sys_exit: result = trapd_exit.cleanup_and_exit(0,pid_file) assert pytest_wrapped_sys_exit.type == SystemExit @@ -24,7 +43,7 @@ class test_cleanup_and_exit(unittest.TestCase): # compare = str(result).startswith("SystemExit: 0") # self.assertEqual(compare, True) - + def test_abnormal_exit(self): """ Test exit with missing PID file exits non-zero |