From 92ff55d2f1974d8c3eb4357f80cae359a087b7eb Mon Sep 17 00:00:00 2001
From: Alexander Bersenev <bay@hackerdom.ru>
Date: Sat, 11 May 2019 04:24:26 +0500
Subject: [PATCH] Make predictable order of items if we don't know the proper
 order.

Also fix tests
---
 pysnooper/tracer.py     | 5 ++++-
 tests/test_pysnooper.py | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pysnooper/tracer.py b/pysnooper/tracer.py
index 88d1dac..64e60aa 100644
--- a/pysnooper/tracer.py
+++ b/pysnooper/tracer.py
@@ -26,8 +26,11 @@ def get_local_reprs(frame, watch=()):
         for key in frame.f_code.co_varnames if key in frame.f_locals
     )
 
+    result.update(sorted((key, utils.get_shortish_repr(frame.f_locals[key]))
+                  for key in set(frame.f_locals) - set(frame.f_code.co_varnames)))
+
     for variable in watch:
-        result.update(variable.items(frame))
+        result.update(sorted(variable.items(frame)))
     return result
 
 
diff --git a/tests/test_pysnooper.py b/tests/test_pysnooper.py
index 18f27ca..e30b696 100644
--- a/tests/test_pysnooper.py
+++ b/tests/test_pysnooper.py
@@ -270,10 +270,10 @@ def test_watch_explode():
             VariableEntry('_point.x', '3'),
             VariableEntry('_point.y', '4'),
             LineEntry(),
+            VariableEntry('lst'),
             VariableEntry('(lst + [])[0]', '7'),
             VariableEntry('(lst + [])[1]', '8'),
             VariableEntry('(lst + [])[2]', '9'),
-            VariableEntry('lst'),
             VariableEntry('lst + []'),
             LineEntry(),
             VariableEntry('(lst + [])[3]', '10'),
@@ -790,23 +790,23 @@ def test_with_block():
         output,
         (
             # In first with
+            VariableEntry('x', '2'),
             VariableEntry('bar1'),
             VariableEntry('bar2'),
             VariableEntry('bar3'),
             VariableEntry('foo'),
             VariableEntry('qux'),
             VariableEntry('snoop'),
-            VariableEntry('x', '2'),
             LineEntry('foo(x - 1)'),
 
             # In with in recursive call
+            VariableEntry('x', '1'),
             VariableEntry('bar1'),
             VariableEntry('bar2'),
             VariableEntry('bar3'),
             VariableEntry('foo'),
             VariableEntry('qux'),
             VariableEntry('snoop'),
-            VariableEntry('x', '1'),
             LineEntry('foo(x - 1)'),
 
             # Call to bar1 from if block outside with