Mercurial > hgsubversion
changeset 1159:d62c53c7a37d
tests: relax testing for tagmap existence
In an upcoming patch, we will turn meta.tags into a lazy property so we only
check the tags file when both exist.
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Sat, 22 Feb 2014 18:23:52 -0600 |
| parents | 770ac6de58c5 |
| children | f06bb42bd2b2 |
| files | tests/comprehensive/test_rebuildmeta.py |
| diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/comprehensive/test_rebuildmeta.py +++ b/tests/comprehensive/test_rebuildmeta.py @@ -110,10 +110,16 @@ def _run_assertions(self, name, single, for tf in ('lastpulled', 'rev_map', 'uuid', 'tagmap', 'layout', 'subdir',): stf = os.path.join(src.path, 'svn', tf) - self.assertTrue(os.path.isfile(stf), '%r is missing!' % stf) + # the generation of tagmap is lazy so it doesn't strictly need to exist + # if it's not being used + if not stf.endswith('tagmap'): + 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 = util.load(stf, resave=False), util.load(dtf, resave=False) + old, new = None, None + if not dtf.endswith('tagmap'): + self.assertTrue(os.path.isfile(dtf), '%r is missing!' % tf) + if os.path.isfile(stf) and os.path.isfile(dtf): + 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,