mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
9dc21f8d0b
Summary: D13853115 adds `edenscm/` to `sys.path` and code still uses `import mercurial`. That has nasty problems if both `import mercurial` and `import edenscm.mercurial` are used, because Python would think `mercurial.foo` and `edenscm.mercurial.foo` are different modules so code like `try: ... except mercurial.error.Foo: ...`, or `isinstance(x, mercurial.foo.Bar)` would fail to handle the `edenscm.mercurial` version. There are also some module-level states (ex. `extensions._extensions`) that would cause trouble if they have multiple versions in a single process. Change imports to use the `edenscm` so ideally the `mercurial` is no longer imported at all. Add checks in extensions.py to catch unexpected extensions importing modules from the old (wrong) locations when running tests. Reviewed By: phillco Differential Revision: D13868981 fbshipit-source-id: f4e2513766957fd81d85407994f7521a08e4de48
70 lines
1.9 KiB
Python
70 lines
1.9 KiB
Python
# no-check-code -- see T24862348
|
|
|
|
import os
|
|
import subprocess
|
|
import tempfile
|
|
import unittest
|
|
|
|
import test_hgsubversion_util
|
|
from edenscm.hgext.hgsubversion import svnwrap
|
|
|
|
|
|
class TestBasicRepoLayout(unittest.TestCase):
|
|
def setUp(self):
|
|
self.tmpdir = tempfile.mkdtemp("svnwrap_test")
|
|
self.repo_path = "%s/testrepo" % self.tmpdir
|
|
|
|
with open(
|
|
os.path.join(
|
|
test_hgsubversion_util.FIXTURES, "project_root_at_repo_root.svndump"
|
|
)
|
|
) as fp:
|
|
svnwrap.create_and_load(self.repo_path, fp)
|
|
|
|
self.repo = svnwrap.SubversionRepo(
|
|
test_hgsubversion_util.fileurl(self.repo_path)
|
|
)
|
|
|
|
def tearDown(self):
|
|
del self.repo
|
|
test_hgsubversion_util.rmtree(self.tmpdir)
|
|
|
|
def test_num_revs(self):
|
|
revs = list(self.repo.revisions())
|
|
self.assertEqual(len(revs), 7)
|
|
r = revs[1]
|
|
self.assertEqual(r.revnum, 2)
|
|
self.assertEqual(
|
|
sorted(r.paths.keys()), ["trunk/alpha", "trunk/beta", "trunk/delta"]
|
|
)
|
|
for r in revs:
|
|
for p in r.paths:
|
|
# make sure these paths are always non-absolute for sanity
|
|
if p:
|
|
assert p[0] != "/"
|
|
revs = list(self.repo.revisions(start=3))
|
|
self.assertEqual(len(revs), 4)
|
|
|
|
|
|
class TestRootAsSubdirOfRepo(TestBasicRepoLayout):
|
|
def setUp(self):
|
|
self.tmpdir = tempfile.mkdtemp("svnwrap_test")
|
|
self.repo_path = "%s/testrepo" % self.tmpdir
|
|
|
|
with open(
|
|
os.path.join(
|
|
test_hgsubversion_util.FIXTURES, "project_root_not_repo_root.svndump"
|
|
)
|
|
) as fp:
|
|
svnwrap.create_and_load(self.repo_path, fp)
|
|
|
|
self.repo = svnwrap.SubversionRepo(
|
|
test_hgsubversion_util.fileurl(self.repo_path + "/dummyproj")
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
import silenttestrunner
|
|
|
|
silenttestrunner.main(__name__)
|