hgsubversion: tests/test_unaffected

annotate tests/test_unaffected_core.py @ 1452:4217a050a088

tests: drop hard-coded list of tests The list of out of date, missing 'test_helpers' and 'comprehensive/test_custom_layout'. Instead, use the discover functionality introduced in Python 2.7, and available for Python 2.6 and earlier from the 'unittest2' backport. Tested by invoking 'run.py' both with and without '-A' in Python 2.6 & 2.7, and ensuring that passing comprehensive tests as arguments continues to work. As a minor (but welcome) side-effect, this should restore the ability to test hgsubversion under demandimport; previously, test_util was imported before we enabled demandimport, so it didn't affect most of Mercurial. Since unittest2 (and unittest) do define SkipTest, we can remove the earlier import, restoring the likely originally intended testing mode.

author	Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date	Sun, 12 Jun 2016 14:55:57 +0200
parents	38be7a6b6def
children	306187268f59

rev	line source
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	1 import test_util
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	2
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	3 import os
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	4 import unittest
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	5
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	6 from mercurial import commands
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	7 from mercurial import dispatch
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	8 from mercurial import error
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	9 from mercurial import hg
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	10 from mercurial import node
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	11 from mercurial import ui
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	12
813 f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 713 diff changeset	13 def _dispatch(ui, cmd):
1344 38be7a6b6def tests: have our dispatch wrappers assert --quiet is always passed Augie Fackler <raf@durin42.com> parents: 1343 diff changeset	14 assert '--quiet' in cmd
813 f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 713 diff changeset	15 try:
f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 713 diff changeset	16 req = dispatch.request(cmd, ui=ui)
f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 713 diff changeset	17 dispatch._dispatch(req)
f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 713 diff changeset	18 except AttributeError:
f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 713 diff changeset	19 dispatch._dispatch(ui, cmd)
f07bfd66db13 test_util: handle dispatch.dispatch() taking a request Patrick Mezard <pmezard@gmail.com> parents: 713 diff changeset	20
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	21 class TestMercurialCore(test_util.TestBase):
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	22 '''
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	23 Test that the core Mercurial operations aren't broken by hgsubversion.
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	24 '''
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	25
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	26 @test_util.requiresoption('updaterev')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	27 def test_update(self):
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	28 ''' Test 'clone --updaterev' '''
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	29 ui = self.ui()
1343 e597714cb420 tests: pass --quiet anyplace we call dispatch to run a command Augie Fackler <raf@durin42.com> parents: 1048 diff changeset	30 _dispatch(ui, ['init', '--quiet', self.wc_path])
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	31 repo = self.repo
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	32 repo.ui.setconfig('ui', 'username', 'anonymous')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	33
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	34 fpath = os.path.join(self.wc_path, 'it')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	35 f = file(fpath, 'w')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	36 f.write('C1')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	37 f.flush()
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	38 commands.add(ui, repo)
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	39 commands.commit(ui, repo, message="C1")
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	40 f.write('C2')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	41 f.flush()
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	42 commands.commit(ui, repo, message="C2")
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	43 f.write('C3')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	44 f.flush()
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	45 commands.commit(ui, repo, message="C3")
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	46
1048 903c9c9dfe6a tests: count revisions explicitly Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1044 diff changeset	47 self.assertEqual(test_util.repolen(repo), 3)
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	48
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	49 updaterev = 1
1343 e597714cb420 tests: pass --quiet anyplace we call dispatch to run a command Augie Fackler <raf@durin42.com> parents: 1048 diff changeset	50 _dispatch(ui, ['clone', '--quiet',
e597714cb420 tests: pass --quiet anyplace we call dispatch to run a command Augie Fackler <raf@durin42.com> parents: 1048 diff changeset	51 self.wc_path, self.wc_path + '2',
e597714cb420 tests: pass --quiet anyplace we call dispatch to run a command Augie Fackler <raf@durin42.com> parents: 1048 diff changeset	52 '--updaterev=%s' % updaterev])
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	53
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	54 repo2 = hg.repository(ui, self.wc_path + '2')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	55
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	56 self.assertEqual(str(repo[updaterev]), str(repo2['.']))
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	57
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	58 @test_util.requiresoption('branch')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	59 def test_branch(self):
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	60 ''' Test 'clone --branch' '''
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	61 ui = self.ui()
1343 e597714cb420 tests: pass --quiet anyplace we call dispatch to run a command Augie Fackler <raf@durin42.com> parents: 1048 diff changeset	62 _dispatch(ui, ['init', '--quiet', self.wc_path])
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	63 repo = self.repo
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	64 repo.ui.setconfig('ui', 'username', 'anonymous')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	65
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	66 fpath = os.path.join(self.wc_path, 'it')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	67 f = file(fpath, 'w')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	68 f.write('C1')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	69 f.flush()
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	70 commands.add(ui, repo)
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	71 commands.branch(ui, repo, label="B1")
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	72 commands.commit(ui, repo, message="C1")
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	73 f.write('C2')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	74 f.flush()
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	75 commands.branch(ui, repo, label="default")
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	76 commands.commit(ui, repo, message="C2")
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	77 f.write('C3')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	78 f.flush()
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	79 commands.branch(ui, repo, label="B2")
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	80 commands.commit(ui, repo, message="C3")
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	81
1048 903c9c9dfe6a tests: count revisions explicitly Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1044 diff changeset	82 self.assertEqual(test_util.repolen(repo), 3)
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	83
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	84 branch = 'B1'
1343 e597714cb420 tests: pass --quiet anyplace we call dispatch to run a command Augie Fackler <raf@durin42.com> parents: 1048 diff changeset	85 _dispatch(ui, [
e597714cb420 tests: pass --quiet anyplace we call dispatch to run a command Augie Fackler <raf@durin42.com> parents: 1048 diff changeset	86 'clone', '--quiet',
e597714cb420 tests: pass --quiet anyplace we call dispatch to run a command Augie Fackler <raf@durin42.com> parents: 1048 diff changeset	87 self.wc_path, self.wc_path + '2',
e597714cb420 tests: pass --quiet anyplace we call dispatch to run a command Augie Fackler <raf@durin42.com> parents: 1048 diff changeset	88 '--branch', branch])
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	89
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	90 repo2 = hg.repository(ui, self.wc_path + '2')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	91
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	92 self.assertEqual(repo[branch].hex(), repo2['.'].hex())

Mercurial > hgsubversion

annotate tests/test_unaffected_core.py @ 1452:4217a050a088