Workaround output variance in pprint.pformat.

tests/gclient_test.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for gclient.py."""
 
 # Fixes include path.
-from super_mox import mox, IsOneOf, SuperMoxTestBase
+from super_mox import mox, SuperMoxTestBase
 
 import gclient
 
 
 class BaseTestCase(SuperMoxTestBase):
   # Like unittest's assertRaises, but checks for Gclient.Error.
   def assertRaisesError(self, msg, fn, *args, **kwargs):
     try:
       fn(*args, **kwargs)
     except gclient.gclient_utils.Error, e:
@@ skipping 337 matching lines @@
     solution_name = 'testRunOnDepsNoDeps_solution_name'
     gclient_config = (
       "solutions = [ {\n"
       "  'name': '%s',\n"
       "  'url': '%s',\n"
       "  'custom_deps': {},\n"
       "} ]\n"
     ) % (solution_name, self.url)
 
     # pprint.pformat() is non-deterministic in this case!!
-    entries_content1 = (
+    entries_content = (
       "entries = \\\n"
       "{ '%s': '%s'}\n"
     ) % (solution_name, self.url)
-    entries_content2 = (
-      "entries = \\\n"
-      "{'%s': '%s'}\n"
-    ) % (solution_name, self.url)
 
     options = self.Options()
 
     checkout_path = gclient.os.path.join(self.root_dir, solution_name)
     gclient.os.path.exists(gclient.os.path.join(checkout_path, '.git')
                            ).AndReturn(False)
     # Expect a check for the entries file and we say there is not one.
     gclient.os.path.exists(
         gclient.os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
 
     # An scm will be requested for the solution.
     scm_wrapper_sol = self.mox.CreateMockAnything()
     gclient.gclient_scm.CreateSCM(self.url, self.root_dir, solution_name
         ).AndReturn(scm_wrapper_sol)
     # Then an update will be performed.
     scm_wrapper_sol.RunCommand('update', options, self.args, [])
     # Then an attempt will be made to read its DEPS file.
     gclient.gclient_utils.FileRead(
         gclient.os.path.join(self.root_dir, solution_name, options.deps_file)
         ).AndRaise(IOError(2, 'No DEPS file'))
 
     # After everything is done, an attempt is made to write an entries
     # file.
     gclient.gclient_utils.FileWrite(
         gclient.os.path.join(self.root_dir, options.entries_filename),
-        IsOneOf((entries_content1, entries_content2)))
+        entries_content)
 
     self.mox.ReplayAll()
     client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
 
   def testRunOnDepsRelativePaths(self):
     solution_name = 'testRunOnDepsRelativePaths_solution_name'
     gclient_config = (
       "solutions = [ {\n"
@@ skipping 238 matching lines @@
   def testRunOnDepsSuccess(self):
     # Fake .gclient file.
     name = 'testRunOnDepsSuccess_solution_name'
     gclient_config = """solutions = [ {
   'name': '%s',
   'url': '%s',
   'custom_deps': {},
 }, ]""" % (name, self.url)
 
     # pprint.pformat() is non-deterministic in this case!!
-    entries_content1 = (
+    entries_content = (
       "entries = \\\n"
       "{ '%s': '%s'}\n"
     ) % (name, self.url)
-    entries_content2 = (
-      "entries = \\\n"
-      "{'%s': '%s'}\n"
-    ) % (name, self.url)
-
 
     options = self.Options()
     gclient.os.path.exists(gclient.os.path.join(self.root_dir, name, '.git')
         ).AndReturn(False)
     gclient.os.path.exists(
         gclient.os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
     gclient.gclient_scm.CreateSCM(self.url, self.root_dir, name).AndReturn(
         gclient.gclient_scm.CreateSCM)
     gclient.gclient_scm.CreateSCM.RunCommand('update', options, self.args, [])
     gclient.gclient_utils.FileRead(
         gclient.os.path.join(self.root_dir, name, options.deps_file)
         ).AndReturn("Boo = 'a'")
     gclient.gclient_utils.FileWrite(
         gclient.os.path.join(self.root_dir, options.entries_filename),
-        IsOneOf((entries_content1, entries_content2)))
+        entries_content)
 
     self.mox.ReplayAll()
     client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
 
   def testRunOnDepsRevisions(self):
     def OptIsRev(options, rev):
       if not options.revision == str(rev):
         print("options.revision = %s" % options.revision)
@@ skipping 363 matching lines @@
         gclient.os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
 
     # This is where gclient tries to do the initial checkout.
     gclient.gclient_scm.CreateSCM(self.url, self.root_dir, target).AndReturn(
         gclient.gclient_scm.CreateSCM)
     gclient.gclient_scm.CreateSCM.RunCommand('updatesingle', options,
         self.args + ["DEPS"], [])
     gclient.gclient_utils.FileWrite(
         gclient.os.path.join(self.root_dir, options.entries_filename),
-        "entries = \\\n{'%s': '%s'}\n" % (name, self.url))
+        "entries = \\\n{ '%s': '%s'}\n" % (name, self.url))
 
     self.mox.ReplayAll()
     client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
 
   def test_PrintRevInfo(self):
     # TODO(aharper): no test yet for revinfo, lock it down once we've verified
     # implementation for Pulse plugin
     pass
@@ skipping 11 matching lines @@
     pass
   def test_VarImpl(self):
     pass
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: