hgsubversion: tests/test_util.py annotate

annotate tests/test_util.py @ 878:6cee57ad9045

pickle_atomic: unbreak old hg versions hg that use rename() instead of close()

author	Augie Fackler <raf@durin42.com>
date	Fri, 20 Apr 2012 18:35:07 -0500
parents	f2de043ac924
children	d3ff5807f1bd

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
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	10 import tempfile
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	11 import unittest
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	12 import urllib
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	13
644 95abc4cfc78f tests: improve import logic Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 626 diff changeset	14 _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	15 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	16
711 cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	17 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	18 from mercurial import commands
492 50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	19 from mercurial import context
813 f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 793 diff changeset	20 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	21 from mercurial import hg
492 50d77547c218 test_util: sort imports Augie Fackler <durin42@gmail.com> parents: 487 diff changeset	22 from mercurial import i18n
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	23 from mercurial import node
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	24 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	25 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	26 from mercurial import extensions
22 95d0109e495e Refactor tests so I can reuse code more. Augie Fackler <durin42@gmail.com> parents: 16 diff changeset	27
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	28 try:
734 e24fb3e27ec9 test_util: use SkipTest if provided by the unittest module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 727 diff changeset	29 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	30 except AttributeError:
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	31 try:
734 e24fb3e27ec9 test_util: use SkipTest if provided by the unittest module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 727 diff changeset	32 from unittest2 import SkipTest
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	33 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	34 try:
e24fb3e27ec9 test_util: use SkipTest if provided by the unittest module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 727 diff changeset	35 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	36 except ImportError:
e24fb3e27ec9 test_util: use SkipTest if provided by the unittest module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 727 diff changeset	37 SkipTest = None
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	38
337 46e69be8e2c8 Reorganize to have a more conventional module structure. Augie Fackler <durin42@gmail.com> parents: 334 diff changeset	39 from hgsubversion import util
333 a59ab58969d9 test_util: normalize path in svnls() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 331 diff changeset	40
479 83fcb1cf6d8f Avoid 'ValueError: close_fds is not supported on Windows platforms' exception Risto Kankkunen <risto.kankkunen@iki.fi> parents: 355 diff changeset	41 # 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	42 # "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	43 # 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	44 # stderr."
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	45 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	46
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	47 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	48 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	49 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	50 else:
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	51 import ctypes
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	52 from ctypes.wintypes import BOOL, DWORD, HANDLE, UINT
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	53
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	54 def win_status_check(result, func, args):
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	55 if result == 0:
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	56 raise ctypes.WinError()
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	57 return args
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	58
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	59 def WINAPI(returns, func, *params):
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	60 assert len(params) % 2 == 0
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	61
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	62 func.argtypes = tuple(params[0::2])
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	63 func.resvalue = returns
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	64 func.errcheck = win_status_check
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	65
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	66 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	67
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	68 # dwDesiredAccess
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	69 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	70
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	71 OpenProcess = WINAPI(HANDLE, ctypes.windll.kernel32.OpenProcess,
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	72 DWORD, 'dwDesiredAccess',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	73 BOOL, 'bInheritHandle',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	74 DWORD, 'dwProcessId',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	75 )
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	76
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	77 CloseHandle = WINAPI(BOOL, ctypes.windll.kernel32.CloseHandle,
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	78 HANDLE, 'hObject'
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	79 )
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	80
487 6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	81 TerminateProcess = WINAPI(BOOL, ctypes.windll.kernel32.TerminateProcess,
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	82 HANDLE, 'hProcess',
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	83 UINT, 'uExitCode'
6b481331c355 test_util: fix up line endings Augie Fackler <durin42@gmail.com> parents: 486 diff changeset	84 )
483 37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	85
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	86 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	87 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	88 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	89 CloseHandle(phnd)
37718f514acb No os.kill() in Windows, use ctypes to call Win32 TerminateProcess() Risto Kankkunen <risto.kankkunen@iki.fi> parents: 479 diff changeset	90
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	91 # 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	92 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	93 '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	94 '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	95 'project_root_not_repo_root.svndump': '/dummyproj',
512 c421e6bf0d95 tests: test paths with spaces Augie Fackler <durin42@gmail.com> parents: 511 diff changeset	96 '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	97 '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	98 'non_ascii_path_2.svndump': '/b%C3%B8b',
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	99 }
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	100
14 d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	101 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	102 'fixtures')
d78dbf88c13d Started a meaningful test suite. Augie Fackler <durin42@gmail.com> parents: diff changeset	103
719 ae52a3b30cfb test_util: refactor requiresoption to ease creation of other skip decorators Augie Fackler <durin42@gmail.com> parents: 717 diff changeset	104
ae52a3b30cfb test_util: refactor requiresoption to ease creation of other skip decorators Augie Fackler <durin42@gmail.com> parents: 717 diff changeset	105 def _makeskip(name, message):
727 e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	106 if SkipTest:
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	107 def skip(args, *kwargs):
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	108 raise SkipTest(message)
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	109 skip.__name__ = name
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	110 return skip
719 ae52a3b30cfb test_util: refactor requiresoption to ease creation of other skip decorators Augie Fackler <durin42@gmail.com> parents: 717 diff changeset	111
720 a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	112 def requiresmodule(mod):
a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	113 """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	114 def decorator(fn):
727 e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	115 if fn is None:
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 720 diff changeset	116 return
720 a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	117 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	118 return fn
a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	119 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	120 return decorator
a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	121
a19a208c085b test_util: new requiresmodule decorator for tests that require a feature Augie Fackler <durin42@gmail.com> parents: 719 diff changeset	122
711 cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	123 def requiresoption(option):
715 c33293a34752 requiresoption: clean up docstring Augie Fackler <durin42@gmail.com> parents: 711 diff changeset	124 '''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	125 def decorator(fn):
cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	126 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	127 if entry[1] == option:
cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	128 return fn
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	129 # no match found, so skip
38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	130 if SkipTest:
719 ae52a3b30cfb test_util: refactor requiresoption to ease creation of other skip decorators Augie Fackler <durin42@gmail.com> parents: 717 diff changeset	131 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	132 'test requires clone to accept %s' % option)
716 38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	133 # no skipping support, so erase decorated method
38ebf7714cdf requiresoption: raise SkipTest if available Augie Fackler <durin42@gmail.com> parents: 715 diff changeset	134 return
711 cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	135 if not isinstance(option, str):
cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	136 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	137 return decorator
cfc7df19e4dc test_util: add requiresoption decorator function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 706 diff changeset	138
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	139 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	140 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	141
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	142 def fileurl(path):
522 60bf433647e7 test_util: fix Windows test URLs Patrick Mezard <pmezard@gmail.com> parents: 516 diff changeset	143 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	144 drive, path = os.path.splitdrive(path)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	145 if drive:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	146 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	147 url = 'file://%s%s' % (drive, path)
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	148 return url
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	149
652 c3900ad3bf69 test_util: support specifying a start revision Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 645 diff changeset	150 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	151 u = ui.ui()
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	152 bools = {True: 'true', False: 'false'}
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	153 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	154 u.setconfig('extensions', 'hgsubversion', '')
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	155 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	156 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	157 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	158 return u
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	159
813 f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 793 diff changeset	160 def dispatch(cmd):
f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 793 diff changeset	161 try:
f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 793 diff changeset	162 req = dispatchmod.request(cmd)
f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 793 diff changeset	163 dispatchmod.dispatch(req)
f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 793 diff changeset	164 except AttributeError, e:
f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 793 diff changeset	165 dispatchmod.dispatch(cmd)
f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 793 diff changeset	166
78 072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	167 def rmtree(path):
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	168 # 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	169 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	170 for f in files:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	171 f = os.path.join(root, f)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	172 try:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	173 s = os.stat(f)
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	174 except OSError, e:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	175 if e.errno == errno.ENOENT:
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	176 continue
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	177 raise
072010a271c6 Fix basic issues with tests on Windows Patrick Mezard <pmezard@gmail.com> parents: 23 diff changeset	178 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	179 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	180 shutil.rmtree(path)
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	181
645 3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	182 def _verify_our_modules():
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	183 '''
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	184 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	185
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	186 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	187 directory containing this file.
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	188 '''
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	189
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	190 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	191 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	192 continue
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 modloc = module.__file__
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	195 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	196 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	197 '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	198 'from the wrong path!'
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	199 )
486 5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	200
816 86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	201 def hgclone(ui, source, dest, update=True):
86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	202 if getattr(hg, 'peer', None):
86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	203 # Since 1.9 (d976542986d2)
86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	204 src, dest = hg.clone(ui, {}, source, dest, update=update)
86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	205 else:
86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	206 src, dest = hg.clone(ui, source, dest, update=update)
86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	207 return src, dest
86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 813 diff changeset	208
869 db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	209 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	210 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	211 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	212 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	213 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	214 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	215 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	216 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	217 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	218 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	219 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	220 entries.sort()
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	221 return entries
db3a651494f9 test_util: pass repo_path to svnls(), turn it into a function Patrick Mezard <patrick@mezard.eu> parents: 868 diff changeset	222
871 51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	223 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	224 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	225 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	226 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	227 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	228 stdout=subprocess.PIPE,
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	229 stderr=subprocess.STDOUT)
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	230 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	231 if p.returncode:
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	232 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	233 return stdout.strip()
51fd75ae62b9 test_util: pass repo_path to svnpropget(), turn into a function Patrick Mezard <patrick@mezard.eu> parents: 870 diff changeset	234
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	235 class TestBase(unittest.TestCase):
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	236 def setUp(self):
645 3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	237 _verify_our_modules()
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	238
832 e9af7eba88db globally: clean up whitespace around operators and commas to conform with PEP8 Yonggang Luo <luoyonggang@gmail.com> parents: 816 diff changeset	239 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	240 ('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	241 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	242 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	243 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	244
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	245 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	246 self.tmpdir = tempfile.mkdtemp(
0c5f6420a8b5 tests: Add an environment variable (HGSUBVERSION_TEST_TEMP) which allows Augie Fackler <durin42@gmail.com> parents: 139 diff changeset	247 '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	248 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	249 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	250 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	251 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	252 print >> rc, l
148 0c5f6420a8b5 tests: Add an environment variable (HGSUBVERSION_TEST_TEMP) which allows Augie Fackler <durin42@gmail.com> parents: 139 diff changeset	253
872 a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	254 self.repocount = 0
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	255 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	256 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	257
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	258 # 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	259 # 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	260 # 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	261 # 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	262 # 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	263 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	264 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	265
872 a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	266 def _makerepopath(self):
a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	267 self.repocount += 1
a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	268 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	269
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	270 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	271 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	272 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	273 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	274 else:
5607e81ba616 test_util: specify LANG=LC_ALL=C so l10n stops breaking tests Augie Fackler <durin42@gmail.com> parents: 483 diff changeset	275 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	276 i18n.t = self.oldt
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	277 rmtree(self.tmpdir)
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	278 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	279 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	280
645 3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	281 _verify_our_modules()
3cb5042531fb tests: verify locations of any imported hgsubversion modules Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 644 diff changeset	282
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	283 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	284 return testui(stupid, layout)
d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	285
866 20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	286 def load_svndump(self, fixture_name):
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	287 '''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	288 path.
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	289 '''
872 a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	290 path = self._makerepopath()
a279b5838aaf test_util: remove self.repo_path, generate new paths each time Patrick Mezard <patrick@mezard.eu> parents: 871 diff changeset	291 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	292 subprocess.call(['svnadmin', 'create', path,],
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	293 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	294 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	295 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	296 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	297 proc.communicate()
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	298 return path
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	299
867 50c13e01c7e3 test_util: add a load_and_fetch() returning the repo_path Patrick Mezard <patrick@mezard.eu> parents: 866 diff changeset	300 def load_and_fetch(self, fixture_name, subdir=None, stupid=False,
50c13e01c7e3 test_util: add a load_and_fetch() returning the repo_path Patrick Mezard <patrick@mezard.eu> parents: 866 diff changeset	301 layout='auto', startrev=0, externals=None,
50c13e01c7e3 test_util: add a load_and_fetch() returning the repo_path Patrick Mezard <patrick@mezard.eu> parents: 866 diff changeset	302 noupdate=True):
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	303 if layout == 'single':
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	304 if subdir is None:
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	305 subdir = 'trunk'
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	306 elif subdir is None:
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 492 diff changeset	307 subdir = ''
866 20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	308 repo_path = self.load_svndump(fixture_name)
20e73b5ab6f7 test_util: merge load_svndump_fixture() into TestBase Patrick Mezard <patrick@mezard.eu> parents: 865 diff changeset	309 projectpath = repo_path
865 04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	310 if subdir:
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	311 projectpath += '/' + subdir
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	312
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	313 cmd = [
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	314 'clone',
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	315 '--layout=%s' % layout,
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	316 '--startrev=%s' % startrev,
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	317 fileurl(projectpath),
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	318 self.wc_path,
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	319 ]
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	320 if stupid:
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	321 cmd.append('--stupid')
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	322 if noupdate:
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	323 cmd.append('--noupdate')
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	324 if externals:
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	325 cmd[:0] = ['--config', 'hgsubversion.externals=%s' % externals]
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	326
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	327 dispatch(cmd)
04729f3a3d17 test_util: merge load_fixture_and_fetch() into TestBase method Patrick Mezard <patrick@mezard.eu> parents: 832 diff changeset	328
867 50c13e01c7e3 test_util: add a load_and_fetch() returning the repo_path Patrick Mezard <patrick@mezard.eu> parents: 866 diff changeset	329 return hg.repository(testui(), self.wc_path), repo_path
50c13e01c7e3 test_util: add a load_and_fetch() returning the repo_path Patrick Mezard <patrick@mezard.eu> parents: 866 diff changeset	330
50c13e01c7e3 test_util: add a load_and_fetch() returning the repo_path Patrick Mezard <patrick@mezard.eu> parents: 866 diff changeset	331 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	332 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	333 return repo
138 40474f6c1f84 diff_cmd: more robust, add tests. Augie Fackler <durin42@gmail.com> parents: 112 diff changeset	334
868 cc1c870f1758 test_util: pass repo_path to _add_svn_rev() explicitely Patrick Mezard <patrick@mezard.eu> parents: 867 diff changeset	335 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	336 '''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	337 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	338 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	339 subprocess.call([
868 cc1c870f1758 test_util: pass repo_path to _add_svn_rev() explicitely Patrick Mezard <patrick@mezard.eu> parents: 867 diff changeset	340 '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	341 self.svn_wc
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	342 ],
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	343 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	344
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	345 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	346 # filenames are / separated
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	347 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	348 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	349 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	350 # may be redundant
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	351 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	352 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	353 subprocess.call([
35a1e93b6f78 tests: move _add_svn_rev to test_util for reuse Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 652 diff changeset	354 '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	355 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	356
82 71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	357 # 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	358 @property
71de43e9f614 Extract PushTest common code into test_util.TestBase Patrick Mezard <pmezard@gmail.com> parents: 78 diff changeset	359 def repo(self):
576 d96aa92d9ad9 tests: silence test suite by using quiet UIs everywhere Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 548 diff changeset	360 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	361
355 256863a65141 test_util: make it easier to test odd push cases Augie Fackler <durin42@gmail.com> parents: 351 diff changeset	362 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	363 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	364 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	365 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	366 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	367 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	368 return res
83 6c9b7cf1c5aa push_cmd: delete empty svn directories, refactor directory creation Patrick Mezard <pmezard@gmail.com> parents: 82 diff changeset	369
870 1eb2a4428c42 test_util: pass repo_path to svnco() explicitely Patrick Mezard <patrick@mezard.eu> parents: 869 diff changeset	370 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	371 path = os.path.join(self.wc_path, path)
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	372 subpath = os.path.dirname(path)
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	373 if not os.path.isdir(subpath):
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	374 os.makedirs(subpath)
870 1eb2a4428c42 test_util: pass repo_path to svnco() explicitely Patrick Mezard <patrick@mezard.eu> parents: 869 diff changeset	375 svnpath = fileurl(repo_path + '/' + svnpath)
764 bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	376 args = ['svn', 'co', '-r', rev, svnpath, path]
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	377 p = subprocess.Popen(args,
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	378 stdout=subprocess.PIPE,
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	379 stderr=subprocess.STDOUT)
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	380 stdout, stderr = p.communicate()
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	381 if p.returncode:
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	382 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	383
355 256863a65141 test_util: make it easier to test odd push cases Augie Fackler <durin42@gmail.com> parents: 351 diff changeset	384 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	385 """Commit changes to mercurial directory
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	386
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	387 '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	388 like:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	389 - (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	390 - (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	391 copied from source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	392 - (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	393 from source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	394 - (source, None, None) to remove source.
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	395 """
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	396 repo = self.repo
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 270 diff changeset	397 parentctx = repo[parent]
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	398
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	399 changed, removed = [], []
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	400 for source, dest, newdata in changes:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	401 if dest is None:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	402 removed.append(source)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	403 else:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	404 changed.append(dest)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	405
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	406 def filectxfn(repo, memctx, path):
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	407 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	408 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	409 "File \"%s\" no longer exists" % path)
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	410 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	411 source, dest, newdata = entry
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	412 if newdata is None:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	413 newdata = parentctx[source].data()
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	414 copied = None
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	415 if source != dest:
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	416 copied = source
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	417 return context.memfilectx(path=dest,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	418 data=newdata,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	419 islink=False,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	420 isexec=False,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	421 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	422
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	423 ctx = context.memctx(repo,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	424 (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	425 message,
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	426 changed + removed,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	427 filectxfn,
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	428 'an_author',
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	429 '2008-10-07 20:59:48 -0500')
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	430 nodeid = repo.commitctx(ctx)
01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	431 repo = self.repo
277 3848a7f9b983 push: Add a test that demonstrates base-text detection works Augie Fackler <durin42@gmail.com> parents: 270 diff changeset	432 hg.clean(repo, nodeid)
84 01e747937d35 test_util: add commitchanges() to TestBase Patrick Mezard <pmezard@gmail.com> parents: 83 diff changeset	433 return nodeid
96 9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	434
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	435 def assertchanges(self, changes, ctx):
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	436 """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	437 went into ctx.
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	438 """
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	439 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	440 if dest is None:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	441 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	442 continue
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	443 self.assertTrue(dest in ctx)
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	444 if data is None:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	445 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	446 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	447 if dest != source:
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	448 copy = ctx[dest].renamed()
9b5e528f67f8 Add a test to check EOLs are correctly converted Patrick Mezard <pmezard@gmail.com> parents: 91 diff changeset	449 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	450
621 3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	451 def assertMultiLineEqual(self, first, second, msg=None):
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	452 """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	453 """
744 6d6be5284056 tests: make assertMultiLineEqual call super, if possible. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	454 try:
6d6be5284056 tests: make assertMultiLineEqual call super, if possible. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	455 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	456 msg)
6d6be5284056 tests: make assertMultiLineEqual call super, if possible. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	457 except AttributeError:
6d6be5284056 tests: make assertMultiLineEqual call super, if possible. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	458 pass
6d6be5284056 tests: make assertMultiLineEqual call super, if possible. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 743 diff changeset	459
621 3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	460 self.assert_(isinstance(first, str),
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	461 ('First argument is not a string'))
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	462 self.assert_(isinstance(second, str),
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	463 ('Second argument is not a string'))
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	464
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	465 if first != second:
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	466 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	467 second.splitlines(True),
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	468 fromfile='a',
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	469 tofile='b'))
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	470 msg = '%s\n%s' % (msg or '', diff)
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	471 raise self.failureException, msg
3e18cdcb6e00 test_util: add assertMultiLineEqual() method. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 576 diff changeset	472
527 2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	473 def draw(self, repo):
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	474 """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	475 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	476 """
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	477 # 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	478 _ui = ui.ui()
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	479 _ui.setconfig('extensions', 'graphlog', '')
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	480 extensions.loadall(_ui)
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	481 graphlog = extensions.find('graphlog')
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	482 templ = """\
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	483 changeset: {rev}:{node\|short}
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	484 branch: {branches}
546 d84116dda52d test_util: add tags to output of draw Augie Fackler <durin42@gmail.com> parents: 531 diff changeset	485 tags: {tags}
527 2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	486 summary: {desc\|firstline}
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	487 files: {files}
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	488
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	489 """
2be9f14bd23f test_util: add helper to draw repo with graphlog extension Patrick Mezard <pmezard@gmail.com> parents: 522 diff changeset	490 graphlog.graphlog(_ui, repo, rev=None, template=templ)

Mercurial > hgsubversion

annotate tests/test_util.py @ 878:6cee57ad9045