auto_stub.SimpleMock: add sanity - sort kwargs in expectations.

testing_support/auto_stub.py

Index: testing_support/auto_stub.py
diff --git a/testing_support/auto_stub.py b/testing_support/auto_stub.py
index bcede8773a416835d1d8b5373201ac302af3a82e..e4fa647877dd047c648ec72dc3ebf4f45f52057f 100644
--- a/testing_support/auto_stub.py
+++ b/testing_support/auto_stub.py
@@ -32,14 +32,19 @@ class AutoStubMixIn(object):
 
 class SimpleMock(object):
   """Really simple manual class mock."""
-  def __init__(self, unit_test):
+  def __init__(self, unit_test, sorted_kwargs=False):
     """Do not call __init__ if you want to use the global call list to detect
     ordering across different instances.
 
     Args:
       unit_test (unittest.TestCase): instance of a test class.
+      sorted_kwargs (bool): if True, kwargs in expectations will always be
+        sorted by key.
     """
+    # TODO(tandrii): sorted_kwargs MUST BE REALLY TRUE by default, but i don't
+    # want to fix all the tests, so keeping backwards compatability.
     self.calls = []
+    self.sorted_kwargs = sorted_kwargs
     self.unit_test = unit_test
     self.assertEqual = unit_test.assertEqual
 
@@ -59,7 +64,11 @@ class SimpleMock(object):
     """Registers the name of the caller function."""
     caller_name = kwargs.pop('caller_name', None) or inspect.stack()[1][3]
     str_args = ', '.join(repr(arg) for arg in args)
-    str_kwargs = ', '.join('%s=%r' % (k, v) for k, v in kwargs.iteritems())
+
+    kwargs_items = kwargs.items()
+    if self.sorted_kwargs:
+      kwargs_items.sort()
+    str_kwargs = ', '.join('%s=%r' % (k, v) for k, v in kwargs_items)
     self.calls.append('%s(%s)' % (
         caller_name, ', '.join(filter(None, [str_args, str_kwargs]))))