hgsubversion: tests/test_util.py annotate

annotate tests/test_util.py @ 469:5567af673f83

Revive svn+http(s) URLs support (issue94) Telling svn from mercurial repository automatically is not always possible, or at least not seamlessly. Let 'http://repo.com/svn' be an svn repository, protected with basic authentication. Trying to clone it directly does something like: 1- Open it like a mercurial repository: * send between command, ask for credentials, fail * fallback to static-http, ask for crendentials two times, fail 2- Open it like an svn repository Mercurial [auth] facility is helpful here, but few people know about it, and it may seem weird to store svn credentials in mercurial configuration. An svn-like password manager would not help either because all connections attempts in [1] fail and it's unlikely we would store credentials in this situation. Instead, we can clone 'svn+http://repo.com/svn', which will skip step [1].

author	Patrick Mezard <pmezard@gmail.com>
date	Sat, 18 Jul 2009 20:44:33 -0500
parents	256863a65141
children	83fcb1cf6d8f

rev	line source
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	1 import errno
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 342 diff changeset	2 import imp
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	3 import os
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	4 import subprocess
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	5 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	6 import StringIO
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	7 import stat
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	8 import tempfile
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	9 import unittest
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	10 import urllib
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	11
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 342 diff changeset	12 import __init__
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 342 diff changeset	13
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	14 from mercurial import context
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	15 from mercurial import commands
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	16 from mercurial import hg
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	17 from mercurial import node
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	18 from mercurial import ui
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	19
337 46e69be8e2c8 Reorganize to have a more conventional module structure. Augie Fackler <durin42@gmail.com> parents: 334 diff changeset	20 from hgsubversion import util
333 a59ab58969d9 test_util: normalize path in svnls() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 331 diff changeset	21
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 # 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	23 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	24 '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	25 'empty_dir_in_trunk_not_repo_root.svndump': '/project',
351 3d5c4352a6c8 test_util: Add another missing project root. Augie Fackler <durin42@gmail.com> parents: 347 diff changeset	26 'project_root_not_repo_root.svndump': '/dummyproj',
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	27 }
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	28
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	29 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	30 'fixtures')
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	31
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	32 def fileurl(path):
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	33 path = os.path.abspath(path)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	34 drive, path = os.path.splitdrive(path)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	35 path = urllib.pathname2url(path)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	36 if drive:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	37 drive = '/' + drive
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	38 url = 'file://%s%s' % (drive, path)
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	39 return url
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	40
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	41 def load_svndump_fixture(path, fixture_name):
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	42 '''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	43 already exist.
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	44 '''
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	45 if os.path.exists(path): rmtree(path)
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	46 subprocess.call(['svnadmin', 'create', path,],
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	47 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	48 inp = open(os.path.join(FIXTURES, fixture_name))
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	49 proc = subprocess.Popen(['svnadmin', 'load', path,], stdin=inp,
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	50 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	51 proc.communicate()
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	52
278 60acc38eac96 clone: prefer tip of default to overall tip when updating Martijn Pieters <mj@zopatista.com> parents: 277 diff changeset	53 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	54 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	55 if subdir:
e58c2f1de059 Fix a regression in converting repositories with files copied in from outside Augie Fackler <durin42@gmail.com> parents: 96 diff changeset	56 repo_path += '/' + subdir
337 46e69be8e2c8 Reorganize to have a more conventional module structure. Augie Fackler <durin42@gmail.com> parents: 334 diff changeset	57
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	58 _ui = ui.ui()
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	59 _ui.setconfig('hgsubversion', 'stupid', str(stupid))
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	60 commands.clone(_ui, fileurl(repo_path), wc_path, noupdate=noupdate)
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	61 _ui = ui.ui()
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	62 _ui.setconfig('hgsubversion', 'stupid', str(stupid))
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	63 return hg.repository(_ui, wc_path)
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	64
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	65 def rmtree(path):
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	66 # 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	67 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	68 for f in files:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	69 f = os.path.join(root, f)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	70 try:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	71 s = os.stat(f)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	72 except OSError, e:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	73 if e.errno == errno.ENOENT:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	74 continue
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	75 raise
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	76 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	77 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	78 shutil.rmtree(path)
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	79
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	80 class TestBase(unittest.TestCase):
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	81 def setUp(self):
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	82 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	83 self.tmpdir = tempfile.mkdtemp(
0c5f6420a8b5 tests: Add an environment variable (HGSUBVERSION_TEST_TEMP) which allows Augie Fackler <durin42@gmail.com> parents: 139 diff changeset	84 '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	85 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	86 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	87 rc = open(self.hgrc, 'w')
334 3c3c3264c362 test_util: Make the patching of ui.ui.write_err() slightly more reusable. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 333 diff changeset	88 for l in '[extensions]', 'hgsubversion=':
3c3c3264c362 test_util: Make the patching of ui.ui.write_err() slightly more reusable. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 333 diff changeset	89 print >> rc, l
148 0c5f6420a8b5 tests: Add an environment variable (HGSUBVERSION_TEST_TEMP) which allows Augie Fackler <durin42@gmail.com> parents: 139 diff changeset	90
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	91 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	92 self.wc_path = '%s/testrepo_wc' % self.tmpdir
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	93
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	94 # Previously, we had a MockUI class that wrapped ui, and giving access
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	95 # to the stream. The ui.pushbuffer() and ui.popbuffer() can be used
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	96 # instead. Using the regular UI class, with all stderr redirected to
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	97 # stdout ensures that the test setup is much more similar to usage
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	98 # setups.
334 3c3c3264c362 test_util: Make the patching of ui.ui.write_err() slightly more reusable. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 333 diff changeset	99 self.patch = (ui.ui.write_err, ui.ui.write)
3c3c3264c362 test_util: Make the patching of ui.ui.write_err() slightly more reusable. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 333 diff changeset	100 setattr(ui.ui, self.patch[0].func_name, self.patch[1])
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	101
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	102 def tearDown(self):
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	103 rmtree(self.tmpdir)
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	104 os.chdir(self.oldwd)
334 3c3c3264c362 test_util: Make the patching of ui.ui.write_err() slightly more reusable. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 333 diff changeset	105 setattr(ui.ui, self.patch[0].func_name, self.patch[0])
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	106
138 40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	107 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	108 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	109 self.wc_path, subdir=subdir,
40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	110 stupid=stupid)
40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	111
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	112 # 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	113 @property
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	114 def repo(self):
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	115 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	116
355 256863a65141 test_util: make it easier to test odd push cases Augie Fackler <durin42@gmail.com> parents: 351 diff changeset	117 def pushrevisions(self, stupid=False, expected_extra_back=0):
170 d046bef502d7 test_util: check all committed revisions are pushed Patrick Mezard <pmezard@gmail.com> parents: 148 diff changeset	118 before = len(self.repo)
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	119 self.repo.ui.setconfig('hgsubversion', 'stupid', str(stupid))
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	120 commands.push(self.repo.ui, self.repo)
170 d046bef502d7 test_util: check all committed revisions are pushed Patrick Mezard <pmezard@gmail.com> parents: 148 diff changeset	121 after = len(self.repo)
355 256863a65141 test_util: make it easier to test odd push cases Augie Fackler <durin42@gmail.com> parents: 351 diff changeset	122 self.assertEqual(expected_extra_back, after - before)
83 6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	123
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	124 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	125 path = self.repo_path + '/' + path
333 a59ab58969d9 test_util: normalize path in svnls() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 331 diff changeset	126 path = util.normalize_url(fileurl(path))
83 6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	127 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	128 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	129 stdout=subprocess.PIPE,
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 326 diff changeset	130 stderr=subprocess.STDOUT)
83 6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	131 stdout, stderr = p.communicate()
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	132 if p.returncode:
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	133 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	134 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	135 entries.sort()
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	136 return entries
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	137
355 256863a65141 test_util: make it easier to test odd push cases Augie Fackler <durin42@gmail.com> parents: 351 diff changeset	138 def commitchanges(self, changes, parent='tip', message='automated test'):
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	139 """Commit changes to mercurial directory
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	140
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	141 '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	142 like:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	143 - (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	144 - (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	145 copied from source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	146 - (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	147 from source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	148 - (source, None, None) to remove source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	149 """
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	150 repo = self.repo
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 270 diff changeset	151 parentctx = repo[parent]
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	152
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	153 changed, removed = [], []
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	154 for source, dest, newdata in changes:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	155 if dest is None:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	156 removed.append(source)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	157 else:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	158 changed.append(dest)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	159
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	160 def filectxfn(repo, memctx, path):
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	161 if path in removed:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	162 raise IOError()
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	163 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	164 source, dest, newdata = entry
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	165 if newdata is None:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	166 newdata = parentctx[source].data()
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	167 copied = None
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	168 if source != dest:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	169 copied = source
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	170 return context.memfilectx(path=dest,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	171 data=newdata,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	172 islink=False,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	173 isexec=False,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	174 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	175
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	176 ctx = context.memctx(repo,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	177 (parentctx.node(), node.nullid),
355 256863a65141 test_util: make it easier to test odd push cases Augie Fackler <durin42@gmail.com> parents: 351 diff changeset	178 message,
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	179 changed + removed,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	180 filectxfn,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	181 'an_author',
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	182 '2008-10-07 20:59:48 -0500')
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	183 nodeid = repo.commitctx(ctx)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	184 repo = self.repo
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 270 diff changeset	185 hg.clean(repo, nodeid)
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	186 return nodeid
96 9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	187
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	188 def assertchanges(self, changes, ctx):
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	189 """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	190 went into ctx.
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	191 """
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	192 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	193 if dest is None:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	194 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	195 continue
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	196 self.assertTrue(dest in ctx)
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	197 if data is None:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	198 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	199 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	200 if dest != source:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	201 copy = ctx[dest].renamed()
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	202 self.assertEqual(copy[0], source)

Mercurial > hgsubversion

annotate tests/test_util.py @ 469:5567af673f83