# HG changeset patch # User Augie Fackler # Date 1439326597 14400 # Node ID e597714cb4203280d9a68f0477a6045c937d8399 # Parent c6b01fd3469455398306fb955b81f8e1fa5c6828 tests: pass --quiet anyplace we call dispatch to run a command Without this the now-in-core progress code will fire when we run dispatch since that picks up a clean ui.ui() instance that we can't set .quiet on easily. diff --git a/tests/test_single_dir_push.py b/tests/test_single_dir_push.py --- a/tests/test_single_dir_push.py +++ b/tests/test_single_dir_push.py @@ -171,7 +171,7 @@ class TestSingleDirPush(test_util.TestBa # Tests pulling and pushing with a renamed branch # Based on test_push_single_dir repo_path = self.load_svndump('branch_from_tag.svndump') - cmd = ['clone', '--layout=single', '--branch=flaf'] + cmd = ['clone', '--quiet', '--layout=single', '--branch=flaf'] if self.stupid: cmd.append('--stupid') cmd += [test_util.fileurl(repo_path), self.wc_path] diff --git a/tests/test_unaffected_core.py b/tests/test_unaffected_core.py --- a/tests/test_unaffected_core.py +++ b/tests/test_unaffected_core.py @@ -26,7 +26,7 @@ class TestMercurialCore(test_util.TestBa def test_update(self): ''' Test 'clone --updaterev' ''' ui = self.ui() - _dispatch(ui, ['init', self.wc_path]) + _dispatch(ui, ['init', '--quiet', self.wc_path]) repo = self.repo repo.ui.setconfig('ui', 'username', 'anonymous') @@ -46,8 +46,9 @@ class TestMercurialCore(test_util.TestBa self.assertEqual(test_util.repolen(repo), 3) updaterev = 1 - _dispatch(ui, ['clone', self.wc_path, self.wc_path + '2', - '--updaterev=%s' % updaterev]) + _dispatch(ui, ['clone', '--quiet', + self.wc_path, self.wc_path + '2', + '--updaterev=%s' % updaterev]) repo2 = hg.repository(ui, self.wc_path + '2') @@ -57,7 +58,7 @@ class TestMercurialCore(test_util.TestBa def test_branch(self): ''' Test 'clone --branch' ''' ui = self.ui() - _dispatch(ui, ['init', self.wc_path]) + _dispatch(ui, ['init', '--quiet', self.wc_path]) repo = self.repo repo.ui.setconfig('ui', 'username', 'anonymous') @@ -80,8 +81,10 @@ class TestMercurialCore(test_util.TestBa self.assertEqual(test_util.repolen(repo), 3) branch = 'B1' - _dispatch(ui, ['clone', self.wc_path, self.wc_path + '2', - '--branch', branch]) + _dispatch(ui, [ + 'clone', '--quiet', + self.wc_path, self.wc_path + '2', + '--branch', branch]) repo2 = hg.repository(ui, self.wc_path + '2') diff --git a/tests/test_util.py b/tests/test_util.py --- a/tests/test_util.py +++ b/tests/test_util.py @@ -567,6 +567,7 @@ class TestBase(unittest.TestCase): cmd = [ 'clone', + '--quiet', '--layout=%s' % layout, '--startrev=%s' % startrev, fileurl(projectpath),