Mercurial > hgsubversion

changeset 1149:34173bbd3b8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: use util.load instead of reading file directly
author Sean Farley <sean.michael.farley@gmail.com>
date Tue, 18 Feb 2014 17:17:02 -0600
parents 91d685418490
children 510fa46caf9c
files tests/comprehensive/test_rebuildmeta.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/comprehensive/test_rebuildmeta.py
+++ b/tests/comprehensive/test_rebuildmeta.py
@@ -113,13 +113,13 @@ def _run_assertions(self, name, single, 
         self.assertTrue(os.path.isfile(stf), '%r is missing!' % stf)
         dtf = os.path.join(dest.path, 'svn', tf)
         self.assertTrue(os.path.isfile(dtf), '%r is missing!' % tf)
-        old, new = open(stf).read(), open(dtf).read()
+        old, new = util.load(stf, resave=False), util.load(dtf, resave=False)
         if tf == 'lastpulled' and (name,
                                    self.stupid, single) in expect_youngest_skew:
             self.assertNotEqual(old, new,
                                 'rebuildmeta unexpected match on youngest rev!')
             continue
-        self.assertMultiLineEqual(old, new, tf + ' differs')
+        self.assertEqual(old, new, tf + ' differs')
         try:
           self.assertEqual(src.branchmap(), dest.branchmap())
         except AttributeError: