diff options
Diffstat (limited to 'docker/storperf-master/tests/carbon_tests')
| -rw-r--r-- | docker/storperf-master/tests/carbon_tests/emitter_test.py | 21 | ||||
| -rw-r--r-- | docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py | 4 |
2 files changed, 19 insertions, 6 deletions
diff --git a/docker/storperf-master/tests/carbon_tests/emitter_test.py b/docker/storperf-master/tests/carbon_tests/emitter_test.py index f5a78d1..7ea515b 100644 --- a/docker/storperf-master/tests/carbon_tests/emitter_test.py +++ b/docker/storperf-master/tests/carbon_tests/emitter_test.py @@ -11,7 +11,7 @@ import json from time import strptime import unittest -import mock +from unittest import mock from storperf.carbon import converter from storperf.carbon.emitter import CarbonMetricTransmitter @@ -69,9 +69,15 @@ class CarbonMetricTransmitterTest(unittest.TestCase): emitter.carbon_port = self.listen_port emitter.transmit_metrics(result, None) + element = "" + for element in data: + element = element.decode('utf-8') + if element.startswith("host.run-name"): + break + self.assertEqual("host.run-name.key 123.0 975542400\n", - data[1], - data[1]) + element, + data) @mock.patch("socket.socket") @mock.patch("time.gmtime") @@ -90,9 +96,14 @@ class CarbonMetricTransmitterTest(unittest.TestCase): emitter.carbon_port = self.listen_port emitter.transmit_metrics(result, None) + element = "" + for element in data: + element = element.decode('utf-8') + if element.startswith("None.commit-marker"): + break self.assertEqual("None.commit-marker 975542400 975542400\n", - data[1], - data[1]) + element, + data) @mock.patch("socket.socket") def test_connect_fails(self, mock_socket): diff --git a/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py b/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py index 523ff77..6043f10 100644 --- a/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py +++ b/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py @@ -7,10 +7,11 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -from storperf.carbon.converter import Converter import json import unittest +from storperf.carbon.converter import Converter + class JSONToCarbonTest(unittest.TestCase): @@ -112,5 +113,6 @@ class JSONToCarbonTest(unittest.TestCase): "value", result["list_with_spaces.1.key"], result["list_with_spaces.1.key"]) + if __name__ == '__main__': unittest.main() |