scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-04 04:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_status_msg: Cleanup broken cleanup function. Don't send an error message if no error has occured.

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-11-22 12:57:29 -08:00
parent 6b45fc4b8e
commit c33cc7e512
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
py-scripts/test_status_msg.py
View File

@@ -29,6 +29,7 @@ class TestStatusMessage(LFCliBase):
self.msg_count = 0 self.msg_count = 0
self.deep_clean = _deep_clean self.deep_clean = _deep_clean
self.check_connect() self.check_connect()
self.debug = _debug_on
def build(self): def build(self):
"""create a new session""" """create a new session"""
@@ -158,22 +159,19 @@ class TestStatusMessage(LFCliBase):
msg_num = 0 msg_num = 0
if msg_num == 0: if msg_num == 0:
self._pass("deleted all messages in session") return "deleted all messages in session"
else: else:
self._fail("failed to delete all messages in session") self._fail("failed to delete all messages in session")
# make sure we fail on removing session incorrectly if 'empty' in self.json_get(self.session_url).keys():
try:
if self.debug: if self.debug:
print("--- del -------------------- -------------------- --------------------") print("--- del -------------------- -------------------- --------------------")
self.exit_on_error = False self.exit_on_error = False
self.json_delete(self.session_url, debug_=False) self.json_delete("%s/this" % self.session_url, debug_=False)
if self.debug: if self.debug:
print("--- ~del -------------------- -------------------- --------------------") print("--- ~del -------------------- -------------------- --------------------")
except ValueError as ve: else:
print("- - - - - - - - - - - - - - - - - - - - - - -") return 'ports deleted successfully'
print(ve)
print("- - - - - - - - - - - - - - - - - - - - - - -")
sessions_list_response = self.json_get("/status-msg") sessions_list_response = self.json_get("/status-msg")
if self.debug: if self.debug:
@@ -189,6 +187,8 @@ class TestStatusMessage(LFCliBase):
break break
if counter == 0: if counter == 0:
self._fail("session incorrectly deleted") self._fail("session incorrectly deleted")
else:
return "Sessions properly deleted"
try: try:
if self.debug: if self.debug:
@@ -247,6 +247,9 @@ Test the status message passing functions of /status-msg:
- delete message: DELETE /status-msg/<new-session-id>/message-id - delete message: DELETE /status-msg/<new-session-id>/message-id
- delete session: DELETE /status-msg/<new-session-id>/this - delete session: DELETE /status-msg/<new-session-id>/this
- delete all messages in session: DELETE /status-msg/<new-session-id>/all - delete all messages in session: DELETE /status-msg/<new-session-id>/all
Example:
./test_status_msg.py
""") """)
parser.add_argument('--action', default="run_test", help=""" parser.add_argument('--action', default="run_test", help="""
Actions can be: Actions can be:
@@ -265,7 +268,7 @@ Actions can be:
status_messages = TestStatusMessage(args.mgr, status_messages = TestStatusMessage(args.mgr,
args.mgr_port, args.mgr_port,
_debug_on=False, _debug_on=args.debug,
_exit_on_error=False, _exit_on_error=False,
_exit_on_fail=False) _exit_on_fail=False)
if args.action == "new": if args.action == "new":