Refactor this to something simpler.

Author: ionelmc

src/pytest_benchmark/plugin.py

@@ -15,7 +15,7 @@
 from .session import PerformanceRegression
 from .timers import default_timer
 from .utils import NameWrapper
-from .utils import format_dict
+from .utils import consistent_dumps
 from .utils import get_commit_info
 from .utils import get_current_time
 from .utils import get_tag
@@ -295,8 +295,8 @@ def pytest_addhooks(pluginmanager):
 
 
 def pytest_benchmark_compare_machine_info(config, benchmarksession, machine_info, compared_benchmark):
-    machine_info = format_dict(machine_info)
-    compared_machine_info = format_dict(compared_benchmark['machine_info'])
+    machine_info = consistent_dumps(machine_info)
+    compared_machine_info = consistent_dumps(compared_benchmark['machine_info'])
 
     if compared_machine_info != machine_info:
         benchmarksession.logger.warning(

src/pytest_benchmark/utils.py

@@ -535,16 +535,15 @@ def clonefunc(f):
     return f2
 
 
-def format_dict(obj):
-    value = ', '.join(f'{k}: {json.dumps(v)}' for k, v in sorted(obj.items()))
-    return f'{value}'
-
-
 class SafeJSONEncoder(json.JSONEncoder):
     def default(self, o):
         return f'UNSERIALIZABLE[{o!r}]'
 
 
+def consistent_dumps(value):
+    return json.dumps(value, sort_keys=True)
+
+
 def safe_dumps(obj, **kwargs):
     return json.dumps(obj, cls=SafeJSONEncoder, **kwargs)
 

tests/test_storage.py

@@ -348,7 +348,7 @@ def test_compare_1(sess, LineMatcher):
     print(output.getvalue())
     LineMatcher(output.getvalue().splitlines()).fnmatch_lines(
         [
-            'Benchmark machine_info is different. Current: {foo: "bar"} VS saved: {machine: "x86_64", node: "minibox", processor: "x86_64", python_compiler: "GCC 4.6.3", python_implementation: "CPython", python_version: "2.7.3", release: "3.13.0-55-generic", system: "Linux"} (location: tests*test_storage).',
+            'Benchmark machine_info is different. Current: {"foo": "bar"} VS saved: {"machine": "x86_64", "node": "minibox", "processor": "x86_64", "python_compiler": "GCC 4.6.3", "python_implementation": "CPython", "python_version": "2.7.3", "release": "3.13.0-55-generic", "system": "Linux"} (location: tests/test_storage).',
             'Comparing against benchmarks from: 0001_b87b9aae14ff14a7887a6bbaa9731b9a8760555d_20150814_190343_uncommitted' '-changes.json',
             '',
             '*------------------------------------------------------------------------ benchmark: 2 tests -----------------------------------------------------------------------*',
@@ -381,7 +381,7 @@ def test_compare_2(sess, LineMatcher):
     print(output.getvalue())
     LineMatcher(output.getvalue().splitlines()).fnmatch_lines(
         [
-            'Benchmark machine_info is different. Current: {foo: "bar"} VS saved: {machine: "x86_64", node: "minibox", processor: "x86_64", python_compiler: "GCC 4.6.3", python_implementation: "CPython", python_version: "2.7.3", release: "3.13.0-55-generic", system: "Linux"} (location: tests*test_storage).',
+            'Benchmark machine_info is different. Current: {"foo": "bar"} VS saved: {"machine": "x86_64", "node": "minibox", "processor": "x86_64", "python_compiler": "GCC 4.6.3", "python_implementation": "CPython", "python_version": "2.7.3", "release": "3.13.0-55-generic", "system": "Linux"} (location: tests/test_storage).',
             'Comparing against benchmarks from: 0002_b87b9aae14ff14a7887a6bbaa9731b9a8760555d_20150814_190348_uncommitted-changes.json',
             '',
             '*------------------------------------------------------------------------ benchmark: 2 tests -----------------------------------------------------------------------*',