hgsubversion: tests/test_util.py annotate

annotate tests/test_util.py @ 326:33736e2e25f0

alternate approach for supporting svn schemes for repository paths We now intercept the operations in the local repo class, and handle the relevant operation ourselves. This frees us from wrapping all relevant commands and replicating their functionality. The implementation is incomplete; only one test has been modified to use the standard Mercurial API with the changed URLs. Once changed, those tests will likely reveal bugs or missing features in the new wrappers. Also, new wrappers will be needed for handling conversion flags such as -A/--authormap.

author	Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date	Thu, 07 May 2009 20:50:53 +0200
parents	dc2bb6faf904
children	75f082b5897e

rev	line source
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	1 import errno
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	2 import os
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	3 import subprocess
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	4 import shutil
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	5 import StringIO
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	6 import stat
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	7 import tempfile
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	8 import unittest
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	9 import urllib
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	10
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	11 from mercurial import context
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	12 from mercurial import hg
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	13 from mercurial import node
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	14 from mercurial import ui
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	15
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 242 diff changeset	16 import wrappers
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	17
194 13ae1bded5e7 Add some comprehensive tests that can be run with nose in order to make it easier to verify stupid and real replay do the same thing. Augie Fackler <durin42@gmail.com> parents: 170 diff changeset	18 # Fixtures that need to be pulled at a subdirectory of the repo path
13ae1bded5e7 Add some comprehensive tests that can be run with nose in order to make it easier to verify stupid and real replay do the same thing. Augie Fackler <durin42@gmail.com> parents: 170 diff changeset	19 subdir = {'truncatedhistory.svndump': '/project2',
13ae1bded5e7 Add some comprehensive tests that can be run with nose in order to make it easier to verify stupid and real replay do the same thing. Augie Fackler <durin42@gmail.com> parents: 170 diff changeset	20 'fetch_missing_files_subdir.svndump': '/foo',
270 2848d17eae71 Fix rebuildmeta tests for empty_dir_in_trunk_not_repo_root Augie Fackler <durin42@gmail.com> parents: 257 diff changeset	21 'empty_dir_in_trunk_not_repo_root.svndump': '/project',
194 13ae1bded5e7 Add some comprehensive tests that can be run with nose in order to make it easier to verify stupid and real replay do the same thing. Augie Fackler <durin42@gmail.com> parents: 170 diff changeset	22 }
13ae1bded5e7 Add some comprehensive tests that can be run with nose in order to make it easier to verify stupid and real replay do the same thing. Augie Fackler <durin42@gmail.com> parents: 170 diff changeset	23
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	24 FIXTURES = os.path.join(os.path.abspath(os.path.dirname(__file__)),
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	25 'fixtures')
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	26
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	27 def fileurl(path):
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	28 path = os.path.abspath(path)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	29 drive, path = os.path.splitdrive(path)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	30 path = urllib.pathname2url(path)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	31 if drive:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	32 drive = '/' + drive
326 33736e2e25f0 alternate approach for supporting svn schemes for repository paths Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 287 diff changeset	33 url = 'svn+file://%s%s' % (drive, path)
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	34 return url
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	35
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	36 def load_svndump_fixture(path, fixture_name):
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	37 '''Loads an svnadmin dump into a fresh repo at path, which should not
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	38 already exist.
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	39 '''
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	40 subprocess.call(['svnadmin', 'create', path,])
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	41 proc = subprocess.Popen(['svnadmin', 'load', path,], stdin=subprocess.PIPE,
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	42 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	43 inp = open(os.path.join(FIXTURES, fixture_name))
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	44 proc.stdin.write(inp.read())
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	45 proc.stdin.flush()
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	46 proc.communicate()
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	47
278 60acc38eac96 clone: prefer tip of default to overall tip when updating Martijn Pieters <mj@zopatista.com> parents: 277 diff changeset	48 def load_fixture_and_fetch(fixture_name, repo_path, wc_path, stupid=False, subdir='', noupdate=True):
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	49 load_svndump_fixture(repo_path, fixture_name)
112 e58c2f1de059 Fix a regression in converting repositories with files copied in from outside Augie Fackler <durin42@gmail.com> parents: 96 diff changeset	50 if subdir:
e58c2f1de059 Fix a regression in converting repositories with files copied in from outside Augie Fackler <durin42@gmail.com> parents: 96 diff changeset	51 repo_path += '/' + subdir
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 242 diff changeset	52 wrappers.clone(None, ui.ui(), source=fileurl(repo_path),
278 60acc38eac96 clone: prefer tip of default to overall tip when updating Martijn Pieters <mj@zopatista.com> parents: 277 diff changeset	53 dest=wc_path, stupid=stupid, noupdate=noupdate)
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	54 repo = hg.repository(ui.ui(), wc_path)
95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	55 return repo
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	56
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	57 def rmtree(path):
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	58 # Read-only files cannot be removed under Windows
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	59 for root, dirs, files in os.walk(path):
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	60 for f in files:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	61 f = os.path.join(root, f)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	62 try:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	63 s = os.stat(f)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	64 except OSError, e:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	65 if e.errno == errno.ENOENT:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	66 continue
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	67 raise
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	68 if (s.st_mode & stat.S_IWRITE) == 0:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	69 os.chmod(f, s.st_mode \| stat.S_IWRITE)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	70 shutil.rmtree(path)
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	71
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	72
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	73 class MockUI(object):
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	74 real_ui = ui.ui
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	75 _isatty = False
285 913fd8aa221c Rename parentui to src (after mercurial rev 9b8ac5fb7760) Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	76 def __init__(self, src=None):
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	77 self.stream = StringIO.StringIO()
285 913fd8aa221c Rename parentui to src (after mercurial rev 9b8ac5fb7760) Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	78 self.inner_ui = self.real_ui(src)
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	79
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	80 def status(self, *args):
139 89a737852d33 utility_commands: Add tests for url and info. Fix a bad mock in the process. Augie Fackler <durin42@gmail.com> parents: 138 diff changeset	81 self.stream.write(''.join(args))
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	82
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	83 def warn(self, *args):
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	84 self.stream.write(*args)
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	85
138 40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	86 def write(self, *args):
40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	87 self.stream.write(*args)
40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	88
287 dc2bb6faf904 Implement the copy method on the mock ui to maintain it across tests. Martijn Pieters <mj@zopatista.com> parents: 285 diff changeset	89 def copy(self):
dc2bb6faf904 Implement the copy method on the mock ui to maintain it across tests. Martijn Pieters <mj@zopatista.com> parents: 285 diff changeset	90 return self.__class__(self.inner_ui)
dc2bb6faf904 Implement the copy method on the mock ui to maintain it across tests. Martijn Pieters <mj@zopatista.com> parents: 285 diff changeset	91
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	92 def __getattr__(self, attr):
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	93 return getattr(self.inner_ui, attr)
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	94
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	95
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	96 class TestBase(unittest.TestCase):
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	97 def setUp(self):
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	98 self.oldwd = os.getcwd()
148 0c5f6420a8b5 tests: Add an environment variable (HGSUBVERSION_TEST_TEMP) which allows Augie Fackler <durin42@gmail.com> parents: 139 diff changeset	99 self.tmpdir = tempfile.mkdtemp(
0c5f6420a8b5 tests: Add an environment variable (HGSUBVERSION_TEST_TEMP) which allows Augie Fackler <durin42@gmail.com> parents: 139 diff changeset	100 'svnwrap_test', dir=os.environ.get('HGSUBVERSION_TEST_TEMP', None))
231 b1543f243910 tests: Start providing our own custom hgrc for testing purposes. Augie Fackler <durin42@gmail.com> parents: 194 diff changeset	101 self.hgrc = os.path.join(self.tmpdir, '.hgrc')
b1543f243910 tests: Start providing our own custom hgrc for testing purposes. Augie Fackler <durin42@gmail.com> parents: 194 diff changeset	102 os.environ['HGRCPATH'] = self.hgrc
b1543f243910 tests: Start providing our own custom hgrc for testing purposes. Augie Fackler <durin42@gmail.com> parents: 194 diff changeset	103 rc = open(self.hgrc, 'w')
b1543f243910 tests: Start providing our own custom hgrc for testing purposes. Augie Fackler <durin42@gmail.com> parents: 194 diff changeset	104 rc.write('[extensions]\nhgsubversion=')
148 0c5f6420a8b5 tests: Add an environment variable (HGSUBVERSION_TEST_TEMP) which allows Augie Fackler <durin42@gmail.com> parents: 139 diff changeset	105
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	106 self.repo_path = '%s/testrepo' % self.tmpdir
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	107 self.wc_path = '%s/testrepo_wc' % self.tmpdir
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	108 self._real_ui = ui.ui
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	109 ui.ui = MockUI
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	110
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	111 def tearDown(self):
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	112 rmtree(self.tmpdir)
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	113 os.chdir(self.oldwd)
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	114 ui.ui = self._real_ui
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	115
138 40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	116 def _load_fixture_and_fetch(self, fixture_name, subdir='', stupid=False):
40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	117 return load_fixture_and_fetch(fixture_name, self.repo_path,
40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	118 self.wc_path, subdir=subdir,
40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	119 stupid=stupid)
40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	120
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	121 # define this as a property so that it reloads anytime we need it
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	122 @property
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	123 def repo(self):
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	124 return hg.repository(ui.ui(), self.wc_path)
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	125
96 9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	126 def pushrevisions(self, stupid=False):
170 d046bef502d7 test_util: check all committed revisions are pushed Patrick Mezard <pmezard@gmail.com> parents: 148 diff changeset	127 before = len(self.repo)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 242 diff changeset	128 wrappers.push(None, ui.ui(), repo=self.repo, stupid=stupid)
170 d046bef502d7 test_util: check all committed revisions are pushed Patrick Mezard <pmezard@gmail.com> parents: 148 diff changeset	129 after = len(self.repo)
d046bef502d7 test_util: check all committed revisions are pushed Patrick Mezard <pmezard@gmail.com> parents: 148 diff changeset	130 self.assertEqual(0, after - before)
83 6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	131
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	132 def svnls(self, path, rev='HEAD'):
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	133 path = self.repo_path + '/' + path
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	134 path = fileurl(path)
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	135 args = ['svn', 'ls', '-r', rev, '-R', path]
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	136 p = subprocess.Popen(args,
7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	137 stdout=subprocess.PIPE,
83 6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	138 stderr=subprocess.PIPE)
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	139 stdout, stderr = p.communicate()
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	140 if p.returncode:
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	141 raise Exception('svn ls failed on %s: %r' % (path, stderr))
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	142 entries = [e.strip('/') for e in stdout.splitlines()]
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	143 entries.sort()
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	144 return entries
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	145
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 270 diff changeset	146 def commitchanges(self, changes, parent='tip'):
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	147 """Commit changes to mercurial directory
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	148
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	149 'changes' is a sequence of tuples (source, dest, data). It can look
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	150 like:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	151 - (source, source, data) to set source content to data
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	152 - (source, dest, None) to set dest content to source one, and mark it as
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	153 copied from source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	154 - (source, dest, data) to set dest content to data, and mark it as copied
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	155 from source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	156 - (source, None, None) to remove source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	157 """
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	158 repo = self.repo
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 270 diff changeset	159 parentctx = repo[parent]
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	160
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	161 changed, removed = [], []
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	162 for source, dest, newdata in changes:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	163 if dest is None:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	164 removed.append(source)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	165 else:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	166 changed.append(dest)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	167
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	168 def filectxfn(repo, memctx, path):
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	169 if path in removed:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	170 raise IOError()
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	171 entry = [e for e in changes if path == e[1]][0]
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	172 source, dest, newdata = entry
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	173 if newdata is None:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	174 newdata = parentctx[source].data()
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	175 copied = None
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	176 if source != dest:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	177 copied = source
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	178 return context.memfilectx(path=dest,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	179 data=newdata,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	180 islink=False,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	181 isexec=False,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	182 copied=copied)
91 7d10165cf3d9 tests: Mock the mercurial.ui.ui class like we really should to capture output. Augie Fackler <durin42@gmail.com> parents: 84 diff changeset	183
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	184 ctx = context.memctx(repo,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	185 (parentctx.node(), node.nullid),
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	186 'automated test',
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	187 changed + removed,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	188 filectxfn,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	189 'an_author',
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	190 '2008-10-07 20:59:48 -0500')
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	191 nodeid = repo.commitctx(ctx)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	192 repo = self.repo
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 270 diff changeset	193 hg.clean(repo, nodeid)
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	194 return nodeid
96 9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	195
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	196 def assertchanges(self, changes, ctx):
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	197 """Assert that all 'changes' (as in defined in commitchanged())
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	198 went into ctx.
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	199 """
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	200 for source, dest, data in changes:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	201 if dest is None:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	202 self.assertTrue(source not in ctx)
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	203 continue
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	204 self.assertTrue(dest in ctx)
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	205 if data is None:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	206 data = ctx.parents()[0][source].data()
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	207 self.assertEqual(ctx[dest].data(), data)
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	208 if dest != source:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	209 copy = ctx[dest].renamed()
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	210 self.assertEqual(copy[0], source)

Mercurial > hgsubversion

annotate tests/test_util.py @ 326:33736e2e25f0