Merge pull request #70 from SumoLogic/SUMO-233810-minor-changes

check_function message updates

Author: himanshu219

EventHubs/tests/baseeventhubtest.py

@@ -100,7 +100,6 @@ def fetchlogs(self, app_insights):
                     row_dict = {str(col): str(item) for col, item in zip(table.columns, row)}
                     result.append(row_dict)
         except Exception as e:
-            print("An unexpected error occurred during the test:")
             print("Exception", e)
 
         return result
@@ -129,10 +128,11 @@ def check_resource_count(self):
         self.assertTrue(resource_count == self.expected_resource_count, f"resource count of resource group {self.RESOURCE_GROUP_NAME} differs from expected count : {resource_count}")
 
     def check_success_log(self, logs):
-        self.assertTrue(self.filter_logs(logs, 'message', self.successful_sent_message))
+        self.assertTrue(self.filter_logs(logs, 'message', self.successful_sent_message), "No success message found in azure function logs")
 
     def check_error_log(self, logs):
-        self.assertTrue(not self.filter_logs(logs, 'severityLevel', '3'))
+        self.assertFalse(self.filter_logs(logs, 'severityLevel', '3'), "Error messages found in azure function logs")
 
     def check_warning_log(self, logs):
-        self.assertTrue(not self.filter_logs(logs, 'severityLevel', '2'))
+        self.assertFalse(self.filter_logs(logs, 'severityLevel', '2'), "Warning messages found in azure function logs")
+

EventHubs/tests/test_eventhub_logs.py

@@ -16,13 +16,14 @@ def setUp(self):
         self.template_name = 'azuredeploy_logs.json'
         self.event_hub_namespace_prefix = "SumoAzureLogsNamespace"
         self.eventhub_name = 'insights-operational-logs'
+        self.successful_sent_message = 'Sent all data to Sumo. Exit now.'
+        self.expected_resource_count = 7
 
     def test_pipeline(self):
         self.create_resource_group()
         self.deploy_template()
         print("Testing Stack Creation")
         self.assertTrue(self.resource_group_exists(self.RESOURCE_GROUP_NAME))
-        self.table_service = self.get_table_service()
         self.insert_mock_logs_in_EventHub('activity_log_fixtures.json')
 
     def insert_mock_logs_in_EventHub(self, filename):
@@ -38,8 +39,6 @@ def insert_mock_logs_in_EventHub(self, filename):
         # print("inserting %s" % (mock_logs))
         self.send_event_data_list(self.event_hub_namespace_prefix, self.eventhub_name, event_data_list)
 
-        print("Event inserted")
-
 
 if __name__ == '__main__':
     unittest.main()