hgsubversion: tests/test_util.py annotate

annotate tests/test_util.py @ 960:502613f6b583

editor: ignore added or copied files excluded by a filemap Files brought by a copied add_directory() were processed despite being excluded by the filemap. This was also the case with added files. The conversion was still correct because they were eventually filtered out in the replay.convert_rev() but processing them in itself may be problematic. Filemaps are often use to exclude large binary files and before this change, some of them could be marked as missing and be fetched before being discarded. A test configuration entry named hgsubversion.failoninvalidreplayfile was added to help testing this case. It should become the default behaviour in the future.

author	Patrick Mezard <patrick@mezard.eu>
date	Sun, 14 Oct 2012 15:51:12 +0200
parents	9c3b4f59e7e6
children	26aa0172725b

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
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	5 import os
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	6 import shutil
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	7 import stat
492 50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	8 import subprocess
50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	9 import sys
910 312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	10 import tarfile
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
644 95abc4cfc78f tests: improve import logic Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 626 diff changeset	15 _rootdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
95abc4cfc78f tests: improve import logic Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 626 diff changeset	16 sys.path.insert(0, _rootdir)
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 342 diff changeset	17
711 cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	18 from mercurial import cmdutil
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	19 from mercurial import commands
492 50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	20 from mercurial import context
813 f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 793 diff changeset	21 from mercurial import dispatch as dispatchmod
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	22 from mercurial import hg
492 50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	23 from mercurial import i18n
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	24 from mercurial import node
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	25 from mercurial import ui
772 f3af4fe98d37 test_util: make manifest filter use shared list of files to ignore Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 764 diff changeset	26 from mercurial import util
527 2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	27 from mercurial import extensions
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	28
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	29 try:
734 e24fb3e27ec9 test_util: use SkipTest if provided by the unittest module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 727 diff changeset	30 SkipTest = unittest.SkipTest
e24fb3e27ec9 test_util: use SkipTest if provided by the unittest module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 727 diff changeset	31 except AttributeError:
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	32 try:
734 e24fb3e27ec9 test_util: use SkipTest if provided by the unittest module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 727 diff changeset	33 from unittest2 import SkipTest
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	34 except ImportError:
734 e24fb3e27ec9 test_util: use SkipTest if provided by the unittest module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 727 diff changeset	35 try:
e24fb3e27ec9 test_util: use SkipTest if provided by the unittest module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 727 diff changeset	36 from nose import SkipTest
e24fb3e27ec9 test_util: use SkipTest if provided by the unittest module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 727 diff changeset	37 except ImportError:
e24fb3e27ec9 test_util: use SkipTest if provided by the unittest module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 727 diff changeset	38 SkipTest = None
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	39
337 46e69be8e2c8 Reorganize to have a more conventional module structure. Augie Fackler <durin42@gmail.com> parents: 334 diff changeset	40 from hgsubversion import util
911 772280aed751 Honor SVN auto-props (solves issue #186) Ronny Voelker <ronny.voelker@googlemail.com> parents: 910 diff changeset	41 from hgsubversion import svnwrap
333 a59ab58969d9 test_util: normalize path in svnls() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 331 diff changeset	42
479 83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 355 diff changeset	43 # 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	44 # "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	45 # 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	46 # stderr."
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	47 canCloseFds = 'win32' not in sys.platform
479 83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 355 diff changeset	48
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	49 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	50 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	51 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	52 else:
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	53 import ctypes
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	54 from ctypes.wintypes import BOOL, DWORD, HANDLE, UINT
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	55
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	56 def win_status_check(result, func, args):
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	57 if result == 0:
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	58 raise ctypes.WinError()
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	59 return args
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	60
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	61 def WINAPI(returns, func, *params):
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	62 assert len(params) % 2 == 0
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	63
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	64 func.argtypes = tuple(params[0::2])
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	65 func.resvalue = returns
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	66 func.errcheck = win_status_check
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	67
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	68 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	69
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	70 # dwDesiredAccess
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	71 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	72
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	73 OpenProcess = WINAPI(HANDLE, ctypes.windll.kernel32.OpenProcess,
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	74 DWORD, 'dwDesiredAccess',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	75 BOOL, 'bInheritHandle',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	76 DWORD, 'dwProcessId',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	77 )
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	78
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	79 CloseHandle = WINAPI(BOOL, ctypes.windll.kernel32.CloseHandle,
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	80 HANDLE, 'hObject'
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	81 )
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	82
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	83 TerminateProcess = WINAPI(BOOL, ctypes.windll.kernel32.TerminateProcess,
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	84 HANDLE, 'hProcess',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	85 UINT, 'uExitCode'
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	86 )
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	87
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	88 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	89 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	90 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	91 CloseHandle(phnd)
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	92
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	93 # 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	94 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	95 '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	96 '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	97 'project_root_not_repo_root.svndump': '/dummyproj',
512 c421e6bf0d95 tests: test paths with spaces Augie Fackler <durin42@gmail.com> parents: 511 diff changeset	98 'project_name_with_space.svndump': '/project name',
717 ae5968ffe6fe svnwrap: fix handling of quotable URLs (fixes #197, refs #132) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 716 diff changeset	99 'non_ascii_path_1.svndump': '/b\xC3\xB8b',
ae5968ffe6fe svnwrap: fix handling of quotable URLs (fixes #197, refs #132) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 716 diff changeset	100 'non_ascii_path_2.svndump': '/b%C3%B8b',
888 c6388ed0ec0a svnmeta: only remove directory components in normalize() Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 886 diff changeset	101 'subdir_is_file_prefix.svndump': '/flaf',
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	102 }
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	103
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	104 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	105 'fixtures')
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	106
930 5bacb9c63e3e Fix more peer breakage with old hg versions Patrick Mezard <patrick@mezard.eu> parents: 923 diff changeset	107 def getlocalpeer(repo):
5bacb9c63e3e Fix more peer breakage with old hg versions Patrick Mezard <patrick@mezard.eu> parents: 923 diff changeset	108 localrepo = getattr(repo, 'local', lambda: repo)()
5bacb9c63e3e Fix more peer breakage with old hg versions Patrick Mezard <patrick@mezard.eu> parents: 923 diff changeset	109 if isinstance(localrepo, bool):
5bacb9c63e3e Fix more peer breakage with old hg versions Patrick Mezard <patrick@mezard.eu> parents: 923 diff changeset	110 localrepo = repo
5bacb9c63e3e Fix more peer breakage with old hg versions Patrick Mezard <patrick@mezard.eu> parents: 923 diff changeset	111 return localrepo
719 ae52a3b30cfb test_util: refactor requiresoption to ease creation of other skip decorators Augie Fackler <durin42@gmail.com> parents: 717 diff changeset	112
ae52a3b30cfb test_util: refactor requiresoption to ease creation of other skip decorators Augie Fackler <durin42@gmail.com> parents: 717 diff changeset	113 def _makeskip(name, message):
727 e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	114 if SkipTest:
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	115 def skip(args, *kwargs):
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	116 raise SkipTest(message)
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	117 skip.__name__ = name
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	118 return skip
719 ae52a3b30cfb test_util: refactor requiresoption to ease creation of other skip decorators Augie Fackler <durin42@gmail.com> parents: 717 diff changeset	119
720 a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	120 def requiresmodule(mod):
a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	121 """Skip a test if the specified module is not None."""
a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	122 def decorator(fn):
727 e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	123 if fn is None:
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	124 return
720 a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	125 if mod is not None:
a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	126 return fn
a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	127 return _makeskip(fn.__name__, 'missing required feature')
a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	128 return decorator
a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	129
a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	130
711 cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	131 def requiresoption(option):
715 c33293a34752 requiresoption: clean up docstring Augie Fackler <durin42@gmail.com> parents: 711 diff changeset	132 '''Skip a test if commands.clone does not take the specified option.'''
711 cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	133 def decorator(fn):
cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	134 for entry in cmdutil.findcmd('clone', commands.table)[1][1]:
cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	135 if entry[1] == option:
cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	136 return fn
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	137 # no match found, so skip
38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	138 if SkipTest:
719 ae52a3b30cfb test_util: refactor requiresoption to ease creation of other skip decorators Augie Fackler <durin42@gmail.com> parents: 717 diff changeset	139 return _makeskip(fn.__name__,
ae52a3b30cfb test_util: refactor requiresoption to ease creation of other skip decorators Augie Fackler <durin42@gmail.com> parents: 717 diff changeset	140 'test requires clone to accept %s' % option)
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	141 # no skipping support, so erase decorated method
38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	142 return
711 cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	143 if not isinstance(option, str):
cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	144 raise TypeError('requiresoption takes a string argument')
cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	145 return decorator
cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	146
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	147 def filtermanifest(manifest):
772 f3af4fe98d37 test_util: make manifest filter use shared list of files to ignore Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 764 diff changeset	148 return [f for f in manifest if f not in util.ignoredfiles]
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	149
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	150 def fileurl(path):
522 60bf433647e7 test_util: fix Windows test URLs Patrick Mezard <pmezard@gmail.com> parents: 516 diff changeset	151 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	152 drive, path = os.path.splitdrive(path)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	153 if drive:
923 847953806c77 test_util: make repourl() return upper-cased drive letters Patrick Mezard <patrick@mezard.eu> parents: 917 diff changeset	154 # In svn 1.7, the swig svn wrapper returns local svn URLs
847953806c77 test_util: make repourl() return upper-cased drive letters Patrick Mezard <patrick@mezard.eu> parents: 917 diff changeset	155 # with an uppercase drive letter, try to match that to
847953806c77 test_util: make repourl() return upper-cased drive letters Patrick Mezard <patrick@mezard.eu> parents: 917 diff changeset	156 # simplify svn info tests.
847953806c77 test_util: make repourl() return upper-cased drive letters Patrick Mezard <patrick@mezard.eu> parents: 917 diff changeset	157 drive = '/' + drive.upper()
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	158 url = 'file://%s%s' % (drive, path)
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	159 return url
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	160
652 c3900ad3bf69 test_util: support specifying a start revision Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 645 diff changeset	161 def testui(stupid=False, layout='auto', startrev=0):
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	162 u = ui.ui()
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	163 bools = {True: 'true', False: 'false'}
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	164 u.setconfig('ui', 'quiet', bools[True])
696 c11bf0dd38d3 tests: enable hgsubversion in the generated UI. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 689 diff changeset	165 u.setconfig('extensions', 'hgsubversion', '')
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	166 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	167 u.setconfig('hgsubversion', 'layout', layout)
652 c3900ad3bf69 test_util: support specifying a start revision Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 645 diff changeset	168 u.setconfig('hgsubversion', 'startrev', startrev)
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	169 return u
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	170
813 f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 793 diff changeset	171 def dispatch(cmd):
916 7e9d805a0e1f tests: fix regressions introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 910 diff changeset	172 cmd = getattr(dispatchmod, 'request', lambda x: x)(cmd)
7e9d805a0e1f tests: fix regressions introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 910 diff changeset	173 dispatchmod.dispatch(cmd)
813 f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 793 diff changeset	174
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	175 def rmtree(path):
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	176 # 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	177 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	178 for f in files:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	179 f = os.path.join(root, f)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	180 try:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	181 s = os.stat(f)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	182 except OSError, e:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	183 if e.errno == errno.ENOENT:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	184 continue
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	185 raise
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	186 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	187 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	188 shutil.rmtree(path)
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	189
645 3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	190 def _verify_our_modules():
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	191 '''
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	192 Verify that hgsubversion was imported from the correct location.
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	193
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	194 The correct location is any location within the parent directory of the
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	195 directory containing this file.
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	196 '''
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	197
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	198 for modname, module in sys.modules.iteritems():
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	199 if not module or not modname.startswith('hgsubversion.'):
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	200 continue
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	201
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	202 modloc = module.__file__
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	203 cp = os.path.commonprefix((os.path.abspath(__file__), modloc))
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	204 assert cp.rstrip(os.sep) == _rootdir, (
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	205 'Module location verification failed: hgsubversion was imported '
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	206 'from the wrong path!'
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	207 )
486 5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	208
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 888 diff changeset	209 def hgclone(ui, source, dest, update=True, rev=None):
816 86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	210 if getattr(hg, 'peer', None):
86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	211 # Since 1.9 (d976542986d2)
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 888 diff changeset	212 src, dest = hg.clone(ui, {}, source, dest, update=update, rev=rev)
816 86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	213 else:
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 888 diff changeset	214 src, dest = hg.clone(ui, source, dest, update=update, rev=rev)
816 86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	215 return src, dest
86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	216
869 db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	217 def svnls(repo_path, path, rev='HEAD'):
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	218 path = repo_path + '/' + path
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	219 path = util.normalize_url(fileurl(path))
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	220 args = ['svn', 'ls', '-r', rev, '-R', path]
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	221 p = subprocess.Popen(args,
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	222 stdout=subprocess.PIPE,
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	223 stderr=subprocess.STDOUT)
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	224 stdout, stderr = p.communicate()
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	225 if p.returncode:
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	226 raise Exception('svn ls failed on %s: %r' % (path, stderr))
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	227 entries = [e.strip('/') for e in stdout.splitlines()]
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	228 entries.sort()
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	229 return entries
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	230
871 51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	231 def svnpropget(repo_path, path, prop, rev='HEAD'):
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	232 path = repo_path + '/' + path
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	233 path = util.normalize_url(fileurl(path))
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	234 args = ['svn', 'propget', '-r', str(rev), prop, path]
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	235 p = subprocess.Popen(args,
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	236 stdout=subprocess.PIPE,
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	237 stderr=subprocess.STDOUT)
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	238 stdout, stderr = p.communicate()
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	239 if p.returncode:
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	240 raise Exception('svn ls failed on %s: %r' % (path, stderr))
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	241 return stdout.strip()
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	242
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	243 class TestBase(unittest.TestCase):
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	244 def setUp(self):
645 3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	245 _verify_our_modules()
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	246
896 04dfc23688b9 allow Python 2.7 to show medium-size multiline diffs when tests fail Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 890 diff changeset	247 # the Python 2.7 default of 640 is obnoxiously low
04dfc23688b9 allow Python 2.7 to show medium-size multiline diffs when tests fail Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 890 diff changeset	248 self.maxDiff = 4096
04dfc23688b9 allow Python 2.7 to show medium-size multiline diffs when tests fail Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 890 diff changeset	249
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	250 self.oldenv = dict([(k, os.environ.get(k, None),) for k in
e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	251 ('LANG', 'LC_ALL', 'HGRCPATH',)])
486 5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	252 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	253 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	254 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	255
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	256 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	257 self.tmpdir = tempfile.mkdtemp(
0c5f6420a8b5 tests: Add an environment variable (HGSUBVERSION_TEST_TEMP) which allows Augie Fackler <durin42@gmail.com> parents: 139 diff changeset	258 '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	259 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	260 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	261 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	262 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	263 print >> rc, l
148 0c5f6420a8b5 tests: Add an environment variable (HGSUBVERSION_TEST_TEMP) which allows Augie Fackler <durin42@gmail.com> parents: 139 diff changeset	264
872 a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	265 self.repocount = 0
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	266 self.wc_path = '%s/testrepo_wc' % self.tmpdir
689 35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	267 self.svn_wc = None
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	268
911 772280aed751 Honor SVN auto-props (solves issue #186) Ronny Voelker <ronny.voelker@googlemail.com> parents: 910 diff changeset	269 self.config_dir = self.tmpdir
772280aed751 Honor SVN auto-props (solves issue #186) Ronny Voelker <ronny.voelker@googlemail.com> parents: 910 diff changeset	270 svnwrap.common._svn_config_dir = self.config_dir
772280aed751 Honor SVN auto-props (solves issue #186) Ronny Voelker <ronny.voelker@googlemail.com> parents: 910 diff changeset	271 self.setup_svn_config('')
772280aed751 Honor SVN auto-props (solves issue #186) Ronny Voelker <ronny.voelker@googlemail.com> parents: 910 diff changeset	272
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	273 # 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	274 # 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	275 # 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	276 # 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	277 # 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	278 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	279 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	280
911 772280aed751 Honor SVN auto-props (solves issue #186) Ronny Voelker <ronny.voelker@googlemail.com> parents: 910 diff changeset	281 def setup_svn_config(self, config):
772280aed751 Honor SVN auto-props (solves issue #186) Ronny Voelker <ronny.voelker@googlemail.com> parents: 910 diff changeset	282 with open(self.config_dir + '/config', 'w') as c:
772280aed751 Honor SVN auto-props (solves issue #186) Ronny Voelker <ronny.voelker@googlemail.com> parents: 910 diff changeset	283 c.write(config)
772280aed751 Honor SVN auto-props (solves issue #186) Ronny Voelker <ronny.voelker@googlemail.com> parents: 910 diff changeset	284
872 a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	285 def _makerepopath(self):
a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	286 self.repocount += 1
a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	287 return '%s/testrepo-%d' % (self.tmpdir, self.repocount)
a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	288
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	289 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	290 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	291 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	292 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	293 else:
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	294 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	295 i18n.t = self.oldt
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	296 rmtree(self.tmpdir)
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	297 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	298 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	299
645 3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	300 _verify_our_modules()
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	301
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	302 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	303 return testui(stupid, layout)
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	304
866 20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	305 def load_svndump(self, fixture_name):
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	306 '''Loads an svnadmin dump into a fresh repo. Return the svn repo
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	307 path.
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	308 '''
872 a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	309 path = self._makerepopath()
a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	310 assert not os.path.exists(path)
866 20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	311 subprocess.call(['svnadmin', 'create', path,],
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	312 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	313 inp = open(os.path.join(FIXTURES, fixture_name))
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	314 proc = subprocess.Popen(['svnadmin', 'load', path,], stdin=inp,
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	315 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	316 proc.communicate()
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	317 return path
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	318
910 312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	319 def load_repo_tarball(self, fixture_name):
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	320 '''Extracts a tarball of an svn repo and returns the svn repo path.'''
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	321 path = self._makerepopath()
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	322 assert not os.path.exists(path)
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	323 os.mkdir(path)
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	324 tarball = tarfile.open(os.path.join(FIXTURES, fixture_name))
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	325 # This is probably somewhat fragile, but I'm not sure how to
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	326 # do better in particular, I think it assumes that the tar
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	327 # entries are in the right order and that directories appear
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	328 # before their contents. This is a valid assummption for sane
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	329 # tarballs, from what I can tell. In particular, for a simple
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	330 # tarball of a svn repo with paths relative to the repo root,
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	331 # it seems to work
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	332 for entry in tarball:
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	333 tarball.extract(entry, path)
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	334 return path
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	335
944 d6db289f1548 pull: add hgsubversion.filestoresize to control memory consumption Patrick Mezard <patrick@mezard.eu> parents: 930 diff changeset	336 def fetch(self, repo_path, subdir=None, stupid=False, layout='auto',
d6db289f1548 pull: add hgsubversion.filestoresize to control memory consumption Patrick Mezard <patrick@mezard.eu> parents: 930 diff changeset	337 startrev=0, externals=None, noupdate=True, dest=None, rev=None,
d6db289f1548 pull: add hgsubversion.filestoresize to control memory consumption Patrick Mezard <patrick@mezard.eu> parents: 930 diff changeset	338 config=None):
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	339 if layout == 'single':
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	340 if subdir is None:
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	341 subdir = 'trunk'
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	342 elif subdir is None:
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	343 subdir = ''
866 20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	344 projectpath = repo_path
865 04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	345 if subdir:
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	346 projectpath += '/' + subdir
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	347
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	348 cmd = [
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	349 'clone',
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	350 '--layout=%s' % layout,
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	351 '--startrev=%s' % startrev,
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	352 fileurl(projectpath),
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	353 self.wc_path,
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	354 ]
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	355 if stupid:
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	356 cmd.append('--stupid')
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	357 if noupdate:
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	358 cmd.append('--noupdate')
908 c4ee11a5d04c pull: add a hgsubversion.unsafeskip option to omit unwanted revs Bryan O'Sullivan <bryano@fb.com> parents: 896 diff changeset	359 if rev is not None:
c4ee11a5d04c pull: add a hgsubversion.unsafeskip option to omit unwanted revs Bryan O'Sullivan <bryano@fb.com> parents: 896 diff changeset	360 cmd.append('--rev=%s' % rev)
944 d6db289f1548 pull: add hgsubversion.filestoresize to control memory consumption Patrick Mezard <patrick@mezard.eu> parents: 930 diff changeset	361 config = dict(config or {})
865 04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	362 if externals:
944 d6db289f1548 pull: add hgsubversion.filestoresize to control memory consumption Patrick Mezard <patrick@mezard.eu> parents: 930 diff changeset	363 config['hgsubversion.externals'] = str(externals)
d6db289f1548 pull: add hgsubversion.filestoresize to control memory consumption Patrick Mezard <patrick@mezard.eu> parents: 930 diff changeset	364 for k,v in reversed(sorted(config.iteritems())):
d6db289f1548 pull: add hgsubversion.filestoresize to control memory consumption Patrick Mezard <patrick@mezard.eu> parents: 930 diff changeset	365 cmd[:0] = ['--config', '%s=%s' % (k, v)]
865 04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	366
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	367 dispatch(cmd)
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	368
886 d3ff5807f1bd fold test_startrev and test_verify into a new test; test_verify_and_startrev Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 874 diff changeset	369 return hg.repository(testui(), self.wc_path)
d3ff5807f1bd fold test_startrev and test_verify into a new test; test_verify_and_startrev Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 874 diff changeset	370
d3ff5807f1bd fold test_startrev and test_verify into a new test; test_verify_and_startrev Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 874 diff changeset	371 def load_and_fetch(self, fixture_name, args, *opts):
910 312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	372 if fixture_name.endswith('.svndump'):
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	373 repo_path = self.load_svndump(fixture_name)
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	374 elif fixture_name.endswith('tar.gz'):
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	375 repo_path = self.load_repo_tarball(fixture_name)
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	376 else:
312f36a425f0 Ignore invalid utf8 in commit messages David Schleimer <dschleimer@fb.com> parents: 908 diff changeset	377 assert False, 'Unknown fixture type'
886 d3ff5807f1bd fold test_startrev and test_verify into a new test; test_verify_and_startrev Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 874 diff changeset	378
d3ff5807f1bd fold test_startrev and test_verify into a new test; test_verify_and_startrev Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 874 diff changeset	379 return self.fetch(repo_path, args, *opts), repo_path
867 50c13e01c7e3 test_util: add a load_and_fetch() returning the repo_path Patrick Mezard <patrick@mezard.eu> parents: 866 diff changeset	380
50c13e01c7e3 test_util: add a load_and_fetch() returning the repo_path Patrick Mezard <patrick@mezard.eu> parents: 866 diff changeset	381 def _load_fixture_and_fetch(self, args, *kwargs):
50c13e01c7e3 test_util: add a load_and_fetch() returning the repo_path Patrick Mezard <patrick@mezard.eu> parents: 866 diff changeset	382 repo, repo_path = self.load_and_fetch(args, *kwargs)
50c13e01c7e3 test_util: add a load_and_fetch() returning the repo_path Patrick Mezard <patrick@mezard.eu> parents: 866 diff changeset	383 return repo
138 40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	384
868 cc1c870f1758 test_util: pass repo_path to _add_svn_rev() explicitely Patrick Mezard <patrick@mezard.eu> parents: 867 diff changeset	385 def add_svn_rev(self, repo_path, changes):
689 35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	386 '''changes is a dict of filename -> contents'''
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	387 if self.svn_wc is None:
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	388 self.svn_wc = os.path.join(self.tmpdir, 'testsvn_wc')
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	389 subprocess.call([
868 cc1c870f1758 test_util: pass repo_path to _add_svn_rev() explicitely Patrick Mezard <patrick@mezard.eu> parents: 867 diff changeset	390 'svn', 'co', '-q', fileurl(repo_path),
689 35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	391 self.svn_wc
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	392 ],
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	393 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	394
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	395 for filename, contents in changes.iteritems():
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	396 # filenames are / separated
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	397 filename = filename.replace('/', os.path.sep)
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	398 filename = os.path.join(self.svn_wc, filename)
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	399 open(filename, 'w').write(contents)
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	400 # may be redundant
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	401 subprocess.call(['svn', 'add', '-q', filename],
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	402 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	403 subprocess.call([
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	404 'svn', 'commit', '-q', self.svn_wc, '-m', 'test changes'],
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	405 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	406
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	407 # 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	408 @property
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	409 def repo(self):
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	410 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	411
355 256863a65141 test_util: make it easier to test odd push cases Augie Fackler <durin42@gmail.com> parents: 351 diff changeset	412 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	413 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	414 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	415 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	416 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	417 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	418 return res
83 6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	419
870 1eb2a4428c42 test_util: pass repo_path to svnco() explicitely Patrick Mezard <patrick@mezard.eu> parents: 869 diff changeset	420 def svnco(self, repo_path, svnpath, rev, path):
764 bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	421 path = os.path.join(self.wc_path, path)
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	422 subpath = os.path.dirname(path)
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	423 if not os.path.isdir(subpath):
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	424 os.makedirs(subpath)
870 1eb2a4428c42 test_util: pass repo_path to svnco() explicitely Patrick Mezard <patrick@mezard.eu> parents: 869 diff changeset	425 svnpath = fileurl(repo_path + '/' + svnpath)
764 bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	426 args = ['svn', 'co', '-r', rev, svnpath, path]
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	427 p = subprocess.Popen(args,
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	428 stdout=subprocess.PIPE,
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	429 stderr=subprocess.STDOUT)
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	430 stdout, stderr = p.communicate()
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	431 if p.returncode:
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	432 raise Exception('svn co failed on %s: %r' % (svnpath, stderr))
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	433
355 256863a65141 test_util: make it easier to test odd push cases Augie Fackler <durin42@gmail.com> parents: 351 diff changeset	434 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	435 """Commit changes to mercurial directory
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	436
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	437 '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	438 like:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	439 - (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	440 - (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	441 copied from source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	442 - (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	443 from source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	444 - (source, None, None) to remove source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	445 """
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	446 repo = self.repo
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 270 diff changeset	447 parentctx = repo[parent]
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	448
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	449 changed, removed = [], []
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	450 for source, dest, newdata in changes:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	451 if dest is None:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	452 removed.append(source)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	453 else:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	454 changed.append(dest)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	455
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	456 def filectxfn(repo, memctx, path):
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	457 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	458 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	459 "File \"%s\" no longer exists" % path)
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	460 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	461 source, dest, newdata = entry
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	462 if newdata is None:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	463 newdata = parentctx[source].data()
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	464 copied = None
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	465 if source != dest:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	466 copied = source
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	467 return context.memfilectx(path=dest,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	468 data=newdata,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	469 islink=False,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	470 isexec=False,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	471 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	472
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	473 ctx = context.memctx(repo,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	474 (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	475 message,
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	476 changed + removed,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	477 filectxfn,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	478 'an_author',
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	479 '2008-10-07 20:59:48 -0500')
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	480 nodeid = repo.commitctx(ctx)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	481 repo = self.repo
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 270 diff changeset	482 hg.clean(repo, nodeid)
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	483 return nodeid
96 9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	484
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	485 def assertchanges(self, changes, ctx):
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	486 """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	487 went into ctx.
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	488 """
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	489 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	490 if dest is None:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	491 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	492 continue
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	493 self.assertTrue(dest in ctx)
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	494 if data is None:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	495 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	496 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	497 if dest != source:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	498 copy = ctx[dest].renamed()
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	499 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	500
621 3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	501 def assertMultiLineEqual(self, first, second, msg=None):
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	502 """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	503 """
744 6d6be5284056 tests: make assertMultiLineEqual call super, if possible. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	504 try:
6d6be5284056 tests: make assertMultiLineEqual call super, if possible. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	505 return super(TestBase, self).assertMultiLineEqual(first, second,
6d6be5284056 tests: make assertMultiLineEqual call super, if possible. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	506 msg)
6d6be5284056 tests: make assertMultiLineEqual call super, if possible. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	507 except AttributeError:
6d6be5284056 tests: make assertMultiLineEqual call super, if possible. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	508 pass
6d6be5284056 tests: make assertMultiLineEqual call super, if possible. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	509
621 3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	510 self.assert_(isinstance(first, str),
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	511 ('First argument is not a string'))
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	512 self.assert_(isinstance(second, str),
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	513 ('Second argument is not a string'))
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	514
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	515 if first != second:
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	516 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	517 second.splitlines(True),
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	518 fromfile='a',
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	519 tofile='b'))
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	520 msg = '%s\n%s' % (msg or '', diff)
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	521 raise self.failureException, msg
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	522
952 9c3b4f59e7e6 stupid: do not close branch upon branch-wide revert Patrick Mezard <patrick@mezard.eu> parents: 944 diff changeset	523 def getgraph(self, repo):
527 2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	524 """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	525 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	526 """
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	527 # 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	528 _ui = ui.ui()
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	529 _ui.setconfig('extensions', 'graphlog', '')
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	530 extensions.loadall(_ui)
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	531 graphlog = extensions.find('graphlog')
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	532 templ = """\
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	533 changeset: {rev}:{node\|short}
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	534 branch: {branches}
546 d84116dda52d test_util: add tags to output of draw Augie Fackler <durin42@gmail.com> parents: 531 diff changeset	535 tags: {tags}
527 2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	536 summary: {desc\|firstline}
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	537 files: {files}
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	538
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	539 """
952 9c3b4f59e7e6 stupid: do not close branch upon branch-wide revert Patrick Mezard <patrick@mezard.eu> parents: 944 diff changeset	540 _ui.pushbuffer()
527 2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	541 graphlog.graphlog(_ui, repo, rev=None, template=templ)
952 9c3b4f59e7e6 stupid: do not close branch upon branch-wide revert Patrick Mezard <patrick@mezard.eu> parents: 944 diff changeset	542 return _ui.popbuffer()
9c3b4f59e7e6 stupid: do not close branch upon branch-wide revert Patrick Mezard <patrick@mezard.eu> parents: 944 diff changeset	543
9c3b4f59e7e6 stupid: do not close branch upon branch-wide revert Patrick Mezard <patrick@mezard.eu> parents: 944 diff changeset	544 def draw(self, repo):
9c3b4f59e7e6 stupid: do not close branch upon branch-wide revert Patrick Mezard <patrick@mezard.eu> parents: 944 diff changeset	545 sys.stdout.write(self.getgraph(repo))
9c3b4f59e7e6 stupid: do not close branch upon branch-wide revert Patrick Mezard <patrick@mezard.eu> parents: 944 diff changeset	546

Mercurial > hgsubversion

annotate tests/test_util.py @ 960:502613f6b583