mirror of
https://github.com/Telecominfraproject/wlan-lanforge-scripts.git
synced 2025-11-03 04:07:52 +00:00
test_status_msg: Cleanup whitespace
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
@@ -10,7 +10,6 @@ if sys.version_info[0] != 3:
|
||||
print("This script requires Python 3")
|
||||
exit(1)
|
||||
|
||||
|
||||
sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../")))
|
||||
|
||||
lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base")
|
||||
@@ -24,13 +23,16 @@ class TestStatusMessage(LFCliBase):
|
||||
_exit_on_error=False,
|
||||
_exit_on_fail=False):
|
||||
super().__init__(host, port, _debug=_debug_on, _exit_on_fail=_exit_on_fail)
|
||||
self.exit_on_error = False
|
||||
self.status_msg_url = "/status-msg"
|
||||
self.session_url = None
|
||||
self.msg_count = 0
|
||||
self.deep_clean = _deep_clean
|
||||
self.check_connect()
|
||||
|
||||
def build(self):
|
||||
"""create a new session"""
|
||||
new_session = uuid1()
|
||||
self.status_msg_url = "/status-msg"
|
||||
self.session_url = "/status-msg/" + str(new_session)
|
||||
# print("----- ----- ----- ----- ----- PUT ----- ----- ----- ----- ----- ----- ")
|
||||
self.json_put(self.session_url, _data={})
|
||||
@@ -55,7 +57,7 @@ class TestStatusMessage(LFCliBase):
|
||||
self._fail(ve)
|
||||
return
|
||||
|
||||
def start(self, print_pass=False, print_fail=False):
|
||||
def start(self):
|
||||
"""
|
||||
create a series of messages
|
||||
:return: None
|
||||
@@ -103,9 +105,8 @@ class TestStatusMessage(LFCliBase):
|
||||
message_response = self.json_get(msg_url)
|
||||
if self.debug:
|
||||
pprint(message_response)
|
||||
for message_o in message_response["messages"]:
|
||||
for content_o in message_response["messages"]:
|
||||
msg_num += 1
|
||||
content_o = message_o
|
||||
print("id %s" % content_o["message_id"])
|
||||
print("key %s" % content_o["message"]["key"])
|
||||
print("content-type %s" % content_o["message"]["content-type"])
|
||||
@@ -125,7 +126,6 @@ class TestStatusMessage(LFCliBase):
|
||||
last_link = ""
|
||||
msg_num = 0
|
||||
for message_o in message_list_response["messages"]:
|
||||
msg_url = message_o["_links"]
|
||||
# print("Delete Message url: "+msg_url)
|
||||
last_link = message_o["_links"]
|
||||
msg_num += 1
|
||||
@@ -157,7 +157,7 @@ class TestStatusMessage(LFCliBase):
|
||||
elif "empty" in message_list_response:
|
||||
msg_num = 0
|
||||
|
||||
if (msg_num == 0):
|
||||
if msg_num == 0:
|
||||
self._pass("deleted all messages in session")
|
||||
else:
|
||||
self._fail("failed to delete all messages in session")
|
||||
@@ -167,7 +167,7 @@ class TestStatusMessage(LFCliBase):
|
||||
if self.debug:
|
||||
print("--- del -------------------- -------------------- --------------------")
|
||||
self.exit_on_error = False
|
||||
message_response = self.json_delete(self.session_url, debug_=False)
|
||||
self.json_delete(self.session_url, debug_=False)
|
||||
if self.debug:
|
||||
print("--- ~del -------------------- -------------------- --------------------")
|
||||
except ValueError as ve:
|
||||
@@ -193,8 +193,7 @@ class TestStatusMessage(LFCliBase):
|
||||
try:
|
||||
if self.debug:
|
||||
print("--- del -------------------- -------------------- --------------------")
|
||||
self.exit_on_error=False
|
||||
message_response = self.json_delete(self.session_url+"/this", debug_=False)
|
||||
self.json_delete(self.session_url + "/this", debug_=False)
|
||||
if self.debug:
|
||||
print("--- ~del -------------------- -------------------- --------------------")
|
||||
except ValueError as ve:
|
||||
@@ -323,7 +322,6 @@ Actions can be:
|
||||
pprint(response_o)
|
||||
return
|
||||
|
||||
|
||||
if args.action == "run_test":
|
||||
if args.deep_clean:
|
||||
status_messages.deep_clean = True
|
||||
@@ -331,7 +329,7 @@ Actions can be:
|
||||
if not status_messages.passes():
|
||||
print(status_messages.get_fail_message())
|
||||
exit(1)
|
||||
status_messages.start(False, False)
|
||||
status_messages.start()
|
||||
status_messages.stop()
|
||||
if not status_messages.passes():
|
||||
print(status_messages.get_fail_message())
|
||||
@@ -341,5 +339,6 @@ Actions can be:
|
||||
print("Full test passed, all messages read and cleaned up")
|
||||
exit(0)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
Reference in New Issue
Block a user