hgsubversion: tests/test_util.py annotate

annotate tests/test_util.py @ 634:a400f3bf5611

replay/stupid: fix tagging on a branch renamed using a branch map Previously, both convert_rev() functions used parentctx.extra() to determine the branch to pass to meta.movetag(). This assumed that the branch name stored in the changeset matches the internal branch. The introduction of branch maps made this assumption unsafe, however: Now, the Mercurial branch can be completely unrelated to the origin of the changeset. It turns out, however, that movetag() already has sufficient knowledge to determine the branch. Given the hash of the new changeset to be tagged, we walk its ancestors until we find an open changeset, which we then know to be the originating branch. This assumes that there were `few' commits made to the tag; an assumption I would consider reasonable.

author	Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date	Sun, 11 Jul 2010 11:46:19 +0200
parents	8e621dbb82d4
children	95abc4cfc78f

rev	line source
492 50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	1 import StringIO
548 2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	2 import difflib
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	3 import errno
492 50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	4 import gettext
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 342 diff changeset	5 import imp
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	6 import os
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	7 import shutil
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	8 import stat
492 50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	9 import subprocess
50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	10 import sys
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	11 import tempfile
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	12 import unittest
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	13 import urllib
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	14
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 342 diff changeset	15 import __init__
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 342 diff changeset	16
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	17 from mercurial import commands
492 50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	18 from mercurial import context
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	19 from mercurial import hg
492 50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	20 from mercurial import i18n
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	21 from mercurial import node
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	22 from mercurial import ui
527 2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	23 from mercurial import extensions
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	24
337 46e69be8e2c8 Reorganize to have a more conventional module structure. Augie Fackler <durin42@gmail.com> parents: 334 diff changeset	25 from hgsubversion import util
333 a59ab58969d9 test_util: normalize path in svnls() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 331 diff changeset	26
479 83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 355 diff changeset	27 # Documentation for Subprocess.Popen() says:
83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 355 diff changeset	28 # "Note that on Windows, you cannot set close_fds to true and
83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 355 diff changeset	29 # also redirect the standard handles by setting stdin, stdout or
83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 355 diff changeset	30 # stderr."
83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 355 diff changeset	31 canCloseFds='win32' not in sys.platform
83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 355 diff changeset	32
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	33 if not 'win32' in sys.platform:
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	34 def kill_process(popen_obj):
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	35 os.kill(popen_obj.pid, 9)
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	36 else:
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	37 import ctypes
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	38 from ctypes.wintypes import BOOL, DWORD, HANDLE, UINT
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	39
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	40 def win_status_check(result, func, args):
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	41 if result == 0:
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	42 raise ctypes.WinError()
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	43 return args
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	44
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	45 def WINAPI(returns, func, *params):
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	46 assert len(params) % 2 == 0
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	47
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	48 func.argtypes = tuple(params[0::2])
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	49 func.resvalue = returns
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	50 func.errcheck = win_status_check
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	51
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	52 return func
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	53
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	54 # dwDesiredAccess
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	55 PROCESS_TERMINATE = 0x0001
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	56
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	57 OpenProcess = WINAPI(HANDLE, ctypes.windll.kernel32.OpenProcess,
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	58 DWORD, 'dwDesiredAccess',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	59 BOOL, 'bInheritHandle',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	60 DWORD, 'dwProcessId',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	61 )
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	62
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	63 CloseHandle = WINAPI(BOOL, ctypes.windll.kernel32.CloseHandle,
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	64 HANDLE, 'hObject'
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	65 )
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	66
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	67 TerminateProcess = WINAPI(BOOL, ctypes.windll.kernel32.TerminateProcess,
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	68 HANDLE, 'hProcess',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	69 UINT, 'uExitCode'
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	70 )
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	71
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	72 def kill_process(popen_obj):
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	73 phnd = OpenProcess(PROCESS_TERMINATE, False, popen_obj.pid)
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	74 TerminateProcess(phnd, 1)
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	75 CloseHandle(phnd)
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	76
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	77 # 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	78 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	79 '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	80 '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	81 'project_root_not_repo_root.svndump': '/dummyproj',
512 c421e6bf0d95 tests: test paths with spaces Augie Fackler <durin42@gmail.com> parents: 511 diff changeset	82 'project_name_with_space.svndump': '/project name',
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	83 }
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	84
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	85 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	86 'fixtures')
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	87
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	88 def filtermanifest(manifest):
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	89 return filter(lambda x: x not in ('.hgtags', '.hgsvnexternals', ),
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	90 manifest)
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 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 fileurl(path):
522 60bf433647e7 test_util: fix Windows test URLs Patrick Mezard <pmezard@gmail.com> parents: 516 diff changeset	93 path = os.path.abspath(path).replace(os.sep, '/')
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	94 drive, path = os.path.splitdrive(path)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	95 if drive:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	96 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	97 url = 'file://%s%s' % (drive, path)
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	98 return url
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	99
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	100 def testui(stupid=False, layout='auto'):
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	101 u = ui.ui()
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	102 bools = {True: 'true', False: 'false'}
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	103 u.setconfig('ui', 'quiet', bools[True])
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	104 u.setconfig('hgsubversion', 'stupid', bools[stupid])
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	105 u.setconfig('hgsubversion', 'layout', layout)
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	106 return u
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	107
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	108 def load_svndump_fixture(path, fixture_name):
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	109 '''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	110 already exist.
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	111 '''
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	112 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	113 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	114 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	115 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	116 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	117 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	118 proc.communicate()
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	119
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	120 def load_fixture_and_fetch(fixture_name, repo_path, wc_path, stupid=False, subdir='',
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	121 noupdate=True, layout='auto'):
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	122 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	123 if subdir:
e58c2f1de059 Fix a regression in converting repositories with files copied in from outside Augie Fackler <durin42@gmail.com> parents: 96 diff changeset	124 repo_path += '/' + subdir
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	125 _ui = testui(stupid=stupid, layout=layout)
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	126 commands.clone(_ui, fileurl(repo_path), wc_path, noupdate=noupdate)
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	127 return hg.repository(testui(), wc_path)
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	128
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	129 def rmtree(path):
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	130 # 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	131 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	132 for f in files:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	133 f = os.path.join(root, f)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	134 try:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	135 s = os.stat(f)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	136 except OSError, e:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	137 if e.errno == errno.ENOENT:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	138 continue
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	139 raise
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	140 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	141 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	142 shutil.rmtree(path)
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	143
486 5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	144
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	145 class TestBase(unittest.TestCase):
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	146 def setUp(self):
486 5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	147 self.oldenv = dict([(k, os.environ.get(k, None), ) for k in
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	148 ('LANG', 'LC_ALL', 'HGRCPATH', )])
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	149 self.oldt = i18n.t
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	150 os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	151 i18n.t = gettext.translation('hg', i18n.localedir, fallback=True)
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	152
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	153 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	154 self.tmpdir = tempfile.mkdtemp(
0c5f6420a8b5 tests: Add an environment variable (HGSUBVERSION_TEST_TEMP) which allows Augie Fackler <durin42@gmail.com> parents: 139 diff changeset	155 '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	156 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	157 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	158 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	159 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	160 print >> rc, l
148 0c5f6420a8b5 tests: Add an environment variable (HGSUBVERSION_TEST_TEMP) which allows Augie Fackler <durin42@gmail.com> parents: 139 diff changeset	161
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	162 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	163 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	164
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	165 # 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	166 # 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	167 # 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	168 # 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	169 # 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	170 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	171 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	172
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	173 def tearDown(self):
486 5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	174 for var, val in self.oldenv.iteritems():
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	175 if val is None:
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	176 del os.environ[var]
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	177 else:
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	178 os.environ[var] = val
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	179 i18n.t = self.oldt
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	180 rmtree(self.tmpdir)
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	181 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	182 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	183
548 2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	184 def assertStringEqual(self, l, r):
2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	185 try:
2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	186 self.assertEqual(l, r, 'failed string equality check, see stdout for details')
2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	187 except:
2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	188 add_nl = lambda li: map(lambda x: x+'\n', li)
2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	189 print 'failed expectation:'
2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	190 print ''.join(difflib.unified_diff(
2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	191 add_nl(l.splitlines()), add_nl(r.splitlines()),
2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	192 fromfile='expected', tofile='got'))
2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	193 raise
2148eb4b4da4 test_util: add assertStringEqual to output diff output for string checks Augie Fackler <durin42@gmail.com> parents: 546 diff changeset	194
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	195 def ui(self, stupid=False, layout='auto'):
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	196 return testui(stupid, layout)
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	197
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	198 def _load_fixture_and_fetch(self, fixture_name, subdir=None, stupid=False, layout='auto'):
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	199 if layout == 'single':
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	200 if subdir is None:
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	201 subdir = 'trunk'
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	202 elif subdir is None:
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	203 subdir = ''
138 40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	204 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	205 self.wc_path, subdir=subdir,
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	206 stupid=stupid, layout=layout)
138 40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	207
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	208 # 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	209 @property
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	210 def repo(self):
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	211 return hg.repository(testui(), self.wc_path)
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	212
355 256863a65141 test_util: make it easier to test odd push cases Augie Fackler <durin42@gmail.com> parents: 351 diff changeset	213 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	214 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	215 self.repo.ui.setconfig('hgsubversion', 'stupid', str(stupid))
626 8e621dbb82d4 push: return reasonable status codes to the end user Augie Fackler <durin42@gmail.com> parents: 621 diff changeset	216 res = 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	217 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	218 self.assertEqual(expected_extra_back, after - before)
626 8e621dbb82d4 push: return reasonable status codes to the end user Augie Fackler <durin42@gmail.com> parents: 621 diff changeset	219 return res
83 6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	220
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	221 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	222 path = self.repo_path + '/' + path
333 a59ab58969d9 test_util: normalize path in svnls() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 331 diff changeset	223 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	224 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	225 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	226 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	227 stderr=subprocess.STDOUT)
83 6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	228 stdout, stderr = p.communicate()
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	229 if p.returncode:
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	230 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	231 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	232 entries.sort()
6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	233 return entries
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	234
355 256863a65141 test_util: make it easier to test odd push cases Augie Fackler <durin42@gmail.com> parents: 351 diff changeset	235 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	236 """Commit changes to mercurial directory
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	237
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	238 '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	239 like:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	240 - (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	241 - (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	242 copied from source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	243 - (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	244 from source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	245 - (source, None, None) to remove source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	246 """
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	247 repo = self.repo
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 270 diff changeset	248 parentctx = repo[parent]
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	249
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	250 changed, removed = [], []
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	251 for source, dest, newdata in changes:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	252 if dest is None:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	253 removed.append(source)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	254 else:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	255 changed.append(dest)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	256
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	257 def filectxfn(repo, memctx, path):
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	258 if path in removed:
531 cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 527 diff changeset	259 raise IOError(errno.ENOENT,
cf4fe45bf8fd Change all instantiations of IOError to set both errno and strerror. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 527 diff changeset	260 "File \"%s\" no longer exists" % path)
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	261 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	262 source, dest, newdata = entry
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	263 if newdata is None:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	264 newdata = parentctx[source].data()
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	265 copied = None
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	266 if source != dest:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	267 copied = source
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	268 return context.memfilectx(path=dest,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	269 data=newdata,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	270 islink=False,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	271 isexec=False,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	272 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	273
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	274 ctx = context.memctx(repo,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	275 (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	276 message,
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	277 changed + removed,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	278 filectxfn,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	279 'an_author',
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	280 '2008-10-07 20:59:48 -0500')
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	281 nodeid = repo.commitctx(ctx)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	282 repo = self.repo
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 270 diff changeset	283 hg.clean(repo, nodeid)
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	284 return nodeid
96 9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	285
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	286 def assertchanges(self, changes, ctx):
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	287 """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	288 went into ctx.
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	289 """
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	290 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	291 if dest is None:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	292 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	293 continue
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	294 self.assertTrue(dest in ctx)
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	295 if data is None:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	296 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	297 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	298 if dest != source:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	299 copy = ctx[dest].renamed()
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	300 self.assertEqual(copy[0], source)
527 2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	301
621 3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	302 def assertMultiLineEqual(self, first, second, msg=None):
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	303 """Assert that two multi-line strings are equal. (Based on Py3k code.)
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	304 """
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	305 self.assert_(isinstance(first, str),
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	306 ('First argument is not a string'))
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	307 self.assert_(isinstance(second, str),
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	308 ('Second argument is not a string'))
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	309
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	310 if first != second:
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	311 diff = ''.join(difflib.unified_diff(first.splitlines(True),
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	312 second.splitlines(True),
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	313 fromfile='a',
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	314 tofile='b'))
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	315 msg = '%s\n%s' % (msg or '', diff)
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	316 raise self.failureException, msg
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	317
527 2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	318 def draw(self, repo):
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	319 """Helper function displaying a repository graph, especially
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	320 useful when debugging comprehensive tests.
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	321 """
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	322 # Could be more elegant, but it works with stock hg
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	323 _ui = ui.ui()
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	324 _ui.setconfig('extensions', 'graphlog', '')
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	325 extensions.loadall(_ui)
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	326 graphlog = extensions.find('graphlog')
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	327 templ = """\
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	328 changeset: {rev}:{node\|short}
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	329 branch: {branches}
546 d84116dda52d test_util: add tags to output of draw Augie Fackler <durin42@gmail.com> parents: 531 diff changeset	330 tags: {tags}
527 2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	331 summary: {desc\|firstline}
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	332 files: {files}
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	333
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	334 """
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	335 graphlog.graphlog(_ui, repo, rev=None, template=templ)

Mercurial > hgsubversion

annotate tests/test_util.py @ 634:a400f3bf5611