hgsubversion: tests/run.py annotate

annotate tests/run.py @ 991:26e9fd21f3bf

push: avoid rebasing when we know there are no conflicts When pushing multiple commits, push would do one rebase per commit. This changes it track the files that have been changed as part of the push and only perform a rebase if the commit touches a file that has been changed previously. On our repo, push used to take 25 seconds per commit. With this change it takes closer to 10 seconds per commit (if there are no conflicts).

author	Durham Goode <durham@fb.com>
date	Wed, 02 Jan 2013 17:54:30 -0800
parents	cf53cfaaa050
children	af84ef787d93

rev	line source
610 300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	1 import optparse
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	2 import os
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	3 import sys
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	4 import unittest
48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	5
727 e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 713 diff changeset	6 import test_util
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 713 diff changeset	7 test_util.SkipTest = None
e830b592917b tests: fix test skipping in pure unittest Augie Fackler <durin42@gmail.com> parents: 713 diff changeset	8
613 58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	9 def tests():
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	10 import test_binaryfiles
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	11 import test_diff
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	12 import test_externals
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	13 import test_fetch_branches
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	14 import test_fetch_command
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	15 import test_fetch_command_regexes
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	16 import test_fetch_exec
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	17 import test_fetch_mappings
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	18 import test_fetch_renames
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	19 import test_fetch_symlinks
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	20 import test_fetch_truncated
919 92bd7b3678ea Add a changegroup hook to update svn metadata Brad Hall <bhall@fb.com> parents: 911 diff changeset	21 import test_hooks
987 cf53cfaaa050 Fixes bug #358. Display correct error message if a svn pre-commit hook blocks the push Anton Agafonov <equeny@fb.com> parents: 932 diff changeset	22 import test_svn_pre_commit_hooks
613 58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	23 import test_pull
932 dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 922 diff changeset	24 import test_pull_fallback
613 58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	25 import test_push_command
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	26 import test_push_renames
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	27 import test_push_dirs
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	28 import test_push_eol
911 772280aed751 Honor SVN auto-props (solves issue #186) Ronny Voelker <ronny.voelker@googlemail.com> parents: 886 diff changeset	29 import test_push_autoprops
613 58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	30 import test_rebuildmeta
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	31 import test_single_dir_clone
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	32 import test_svnwrap
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	33 import test_tags
684 8687c5aa4f35 Add svnrev, svnpath and svnuuid keyword. Andi Albrecht <albrecht.andi@gmail.com> parents: 682 diff changeset	34 import test_template_keywords
613 58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	35 import test_utility_commands
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 697 diff changeset	36 import test_unaffected_core
922 6b7ac659c855 updatemeta: correctly handle empty metadata Jun Fang <junfang@fb.com> parents: 919 diff changeset	37 import test_updatemeta
613 58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	38 import test_urls
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	39
613 58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	40 sys.path.append(os.path.dirname(__file__))
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	41 sys.path.append(os.path.join(os.path.dirname(__file__), 'comprehensive'))
426 72e63999722f tests: make comprehensive tests work properly with nose and run.py Augie Fackler <durin42@gmail.com> parents: 395 diff changeset	42
613 58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	43 import test_stupid_pull
886 d3ff5807f1bd fold test_startrev and test_verify into a new test; test_verify_and_startrev Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 833 diff changeset	44 import test_verify_and_startrev
613 58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	45
58f397523604 testrunner: delay and `simplify' importing of tests Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 610 diff changeset	46 return locals()
394 d70c8e45cb9e tests: add -A option to run.py for running comprehensive tests Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 393 diff changeset	47
d70c8e45cb9e tests: add -A option to run.py for running comprehensive tests Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 393 diff changeset	48 def comprehensive(mod):
d70c8e45cb9e tests: add -A option to run.py for running comprehensive tests Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 393 diff changeset	49 dir = os.path.basename(os.path.dirname(mod.__file__))
d70c8e45cb9e tests: add -A option to run.py for running comprehensive tests Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 393 diff changeset	50 return dir == 'comprehensive'
d70c8e45cb9e tests: add -A option to run.py for running comprehensive tests Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 393 diff changeset	51
16 48a44546c12f Add a basic system for running the hgsubversion tests (although not the svnwrap ones) without requiring Nose. Nose is still the recommended way to run the tests. Augie Fackler <durin42@gmail.com> parents: diff changeset	52 if __name__ == '__main__':
610 300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	53 description = ("This script runs the hgsubversion tests. If no tests are "
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	54 "specified, all known tests are implied.")
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	55 parser = optparse.OptionParser(usage="%prog [options] [TESTS ...]",
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	56 description=description)
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	57 parser.add_option("-A", "--all",
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	58 dest="comprehensive", action="store_true", default=False,
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	59 help="include slow, but comprehensive tests")
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	60 parser.add_option("-v", "--verbose",
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	61 dest="verbose", action="store_true", default=False,
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	62 help="enable verbose output")
614 4f6017ba4d3d testrunner: use demandimport, with an option to disable it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 613 diff changeset	63 parser.add_option("", "--no-demandimport",
4f6017ba4d3d testrunner: use demandimport, with an option to disable it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 613 diff changeset	64 dest="demandimport", action="store_false", default=True,
4f6017ba4d3d testrunner: use demandimport, with an option to disable it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 613 diff changeset	65 help="disable Mercurial demandimport loading")
682 52fbb272a147 tests: add an option to the test-runner for selecting bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 653 diff changeset	66 parser.add_option("", "--bindings",
52fbb272a147 tests: add an option to the test-runner for selecting bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 653 diff changeset	67 dest="bindings", action="store", default=None,
52fbb272a147 tests: add an option to the test-runner for selecting bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 653 diff changeset	68 choices=["swig", "subvertpy"],
52fbb272a147 tests: add an option to the test-runner for selecting bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 653 diff changeset	69 help="test using the specified bindings (swig or "
52fbb272a147 tests: add an option to the test-runner for selecting bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 653 diff changeset	70 "subvertpy)")
688 073132fc27f1 tests: add --show-stdout option to run.py Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 684 diff changeset	71 parser.add_option("", "--show-stdout",
073132fc27f1 tests: add --show-stdout option to run.py Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 684 diff changeset	72 dest="showstdout", action="store_true", default=False,
073132fc27f1 tests: add --show-stdout option to run.py Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 684 diff changeset	73 help="show stdout (hidden by default)")
357 d19843ac13c9 Allow passing in module arguments to the test runs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 347 diff changeset	74
610 300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	75 (options, args) = parser.parse_args()
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	76
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	77 if options.verbose:
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	78 testargs = { 'descriptions': 3, 'verbosity': 2 }
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	79 else:
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	80 testargs = {'descriptions': 2}
303 f423a8780832 Minor tweaks to how the tests are run. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 174 diff changeset	81
615 edd112855189 tests/run.py: make sure our hgsubversion loads correctly Augie Fackler <durin42@gmail.com> parents: 614 diff changeset	82 sys.path.append(os.path.dirname(os.path.dirname(__file__)))
edd112855189 tests/run.py: make sure our hgsubversion loads correctly Augie Fackler <durin42@gmail.com> parents: 614 diff changeset	83
614 4f6017ba4d3d testrunner: use demandimport, with an option to disable it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 613 diff changeset	84 if options.demandimport:
4f6017ba4d3d testrunner: use demandimport, with an option to disable it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 613 diff changeset	85 from mercurial import demandimport
4f6017ba4d3d testrunner: use demandimport, with an option to disable it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 613 diff changeset	86 demandimport.enable()
4f6017ba4d3d testrunner: use demandimport, with an option to disable it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 613 diff changeset	87
682 52fbb272a147 tests: add an option to the test-runner for selecting bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 653 diff changeset	88 if options.bindings:
697 e9306b23d323 testrunner: don't use os.putenv(), as it may not affect os.environ. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 688 diff changeset	89 os.environ['HGSUBVERSION_BINDINGS'] = options.bindings
682 52fbb272a147 tests: add an option to the test-runner for selecting bindings. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 653 diff changeset	90
644 95abc4cfc78f tests: improve import logic Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 629 diff changeset	91 # make sure our copy of hgsubversion gets imported by loading test_util
95abc4cfc78f tests: improve import logic Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 629 diff changeset	92 import test_util
95abc4cfc78f tests: improve import logic Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 629 diff changeset	93 test_util.TestBase
95abc4cfc78f tests: improve import logic Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 629 diff changeset	94
338 47c0110046dc tests: silence tests when using run.py Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	95 # silence output when running outside nose
688 073132fc27f1 tests: add --show-stdout option to run.py Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 684 diff changeset	96 if not options.showstdout:
073132fc27f1 tests: add --show-stdout option to run.py Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 684 diff changeset	97 import tempfile
073132fc27f1 tests: add --show-stdout option to run.py Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 684 diff changeset	98 sys.stdout = tempfile.TemporaryFile()
338 47c0110046dc tests: silence tests when using run.py Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	99
833 312b37bc5e20 tests: avoid shadowing Python builtin all() Yonggang Luo <luoyonggang@gmail.com> parents: 727 diff changeset	100 all_tests = tests()
357 d19843ac13c9 Allow passing in module arguments to the test runs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 347 diff changeset	101
d19843ac13c9 Allow passing in module arguments to the test runs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 347 diff changeset	102 args = [i.split('.py')[0].replace('-', '_') for i in args]
d19843ac13c9 Allow passing in module arguments to the test runs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 347 diff changeset	103
d19843ac13c9 Allow passing in module arguments to the test runs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 347 diff changeset	104 if not args:
610 300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	105 check = lambda x: options.comprehensive or not comprehensive(x)
833 312b37bc5e20 tests: avoid shadowing Python builtin all() Yonggang Luo <luoyonggang@gmail.com> parents: 727 diff changeset	106 mods = [m for (n, m) in sorted(all_tests.iteritems()) if check(m)]
394 d70c8e45cb9e tests: add -A option to run.py for running comprehensive tests Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 393 diff changeset	107 suite = [m.suite() for m in mods]
357 d19843ac13c9 Allow passing in module arguments to the test runs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 347 diff changeset	108 else:
d19843ac13c9 Allow passing in module arguments to the test runs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 347 diff changeset	109 suite = []
d19843ac13c9 Allow passing in module arguments to the test runs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 347 diff changeset	110 for arg in args:
610 300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	111 if arg == 'test_util':
300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	112 continue
833 312b37bc5e20 tests: avoid shadowing Python builtin all() Yonggang Luo <luoyonggang@gmail.com> parents: 727 diff changeset	113 elif arg not in all_tests:
393 e857e5cfc10f tests: send warning to stderr instead of redirected stdout Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 357 diff changeset	114 print >> sys.stderr, 'test module %s not available' % arg
357 d19843ac13c9 Allow passing in module arguments to the test runs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 347 diff changeset	115 else:
833 312b37bc5e20 tests: avoid shadowing Python builtin all() Yonggang Luo <luoyonggang@gmail.com> parents: 727 diff changeset	116 suite.append(all_tests[arg].suite())
357 d19843ac13c9 Allow passing in module arguments to the test runs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 347 diff changeset	117
610 300b917d23c5 testrunner: use optparse Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 577 diff changeset	118 runner = unittest.TextTestRunner(**testargs)
571 f3e5ef8760cb tests.run: exit nonzero if tests did not pass Augie Fackler <durin42@gmail.com> parents: 426 diff changeset	119 result = runner.run(unittest.TestSuite(suite))
f3e5ef8760cb tests.run: exit nonzero if tests did not pass Augie Fackler <durin42@gmail.com> parents: 426 diff changeset	120 if not result.wasSuccessful():
f3e5ef8760cb tests.run: exit nonzero if tests did not pass Augie Fackler <durin42@gmail.com> parents: 426 diff changeset	121 sys.exit(1)

Mercurial > hgsubversion

annotate tests/run.py @ 991:26e9fd21f3bf