Fixes some tests, some still broken

clmctest/monitoring/test_e2eresults.py

@@ -59,9 +59,9 @@ class TestE2ESimulation(object):
 
     @pytest.mark.parametrize("query, expected_result", [
         ('SELECT count(*) FROM "E2EMetrics"."autogen"."network_delays"',
-         {"time": "1970-01-01T00:00:00Z", "count_delay": 120}),
+         {"time": "1970-01-01T00:00:00Z", "count_latency": 120}),
         ('SELECT count(*) FROM "E2EMetrics"."autogen"."service_delays"',
-         {"time": "1970-01-01T00:00:00Z", "count_response_time": 24}),
+         {"time": "1970-01-01T00:00:00Z", "count_response_time": 24, "count_request_size": 24, "count_response_size": 24}),
         ('SELECT count(*) FROM "E2EMetrics"."autogen"."e2e_delays"',
          {"time": "1970-01-01T00:00:00Z", "count_delay_forward": 24, "count_delay_reverse": 24, "count_delay_service": 24}),