Mercurial > hgsubversion

diff tests/test_single_dir_push.py @ 1539:0ebcc5bbf692
tests: when making a `memctx`, make sure to use a single repo instance The way self.repo is dynamic produces bad lock behavior because the `context.memctx` ends up with a different instance than self in `localrepo.commitctx`, which means the callbacks in the `memctx` get an unlocked repo instance. This causes lock warning failures. When it's not a code freeze for core, we should probably: * Make lock failures hard, not just warnings * Stop holding a repo reference in memctx, or otherwise check it's the same instance as `self` during `localrepo.commitctx` That's my best guess based on the (very hard to debug) test failures here.
author: Augie Fackler <raf@durin42.com>
date: Sat, 28 Oct 2017 21:34:52 -0400
parents: e597714cb420
children: 8410a978c650
--- a/tests/test_single_dir_push.py
+++ b/tests/test_single_dir_push.py
@@ -186,15 +186,16 @@ class TestSingleDirPush(test_util.TestBa
                                                   isexec=False,
                                                   copied=False)
             raise IOError(errno.EINVAL, 'Invalid operation: ' + path)
-        ctx = context.memctx(self.repo,
-                             (self.repo['tip'].node(), node.nullid),
+        lr = self.repo
+        ctx = context.memctx(lr,
+                             (lr['tip'].node(), node.nullid),
                              'automated test',
                              ['adding_file'],
                              file_callback,
                              'an_author',
                              '2009-10-19 18:49:30 -0500',
                              {'branch': 'default', })
-        self.repo.commitctx(ctx)
+        lr.commitctx(ctx)
         hg.update(self.repo, self.repo['tip'].node())
         self.pushrevisions()
         self.assertTrue('adding_file' in test_util.svnls(repo_path, ''))
author	Augie Fackler <raf@durin42.com>
date	Sat, 28 Oct 2017 21:34:52 -0400
parents	e597714cb420
children	8410a978c650