← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_help.py

  • Committer: Martin Pool
  • Date: 2007-06-26 08:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 2555.
  • Revision ID: mbp@sourcefrog.net-20070626080236-14ihgomtffc9tezj
Cleanup old variations on run_bzr in the test suite

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_help.py
27
27
 
28
28
    def test_help_basic(self):
29
29
        for cmd in ['--help', 'help', '-h', '-?']:
30
 
            output = self.runbzr(cmd)[0]
 
30
            output = self.run_bzr(cmd)[0]
31
31
            line1 = output.split('\n')[0]
32
32
            if not line1.startswith('Bazaar'):
33
33
                self.fail("bad output from bzr %s:\n%r" % (cmd, output))
54
54
 
55
55
    def test_help_checkouts(self):
56
56
        """Smoke test for 'bzr help checkouts'"""
57
 
        out, err = self.runbzr('help checkouts')
 
57
        out, err = self.run_bzr('help checkouts')
58
58
        self.assertContainsRe(out, 'checkout')
59
59
        self.assertContainsRe(out, 'lightweight')
60
60
        
72
72
 
73
73
    def test_help_repositories(self):
74
74
        """Smoke test for 'bzr help repositories'"""
75
 
        out, err = self.runbzr('help repositories')
 
75
        out, err = self.run_bzr('help repositories')
76
76
        self.assertEqual(bzrlib.help_topics._repositories, out)
77
77
 
78
78
    def test_help_working_trees(self):
79
79
        """Smoke test for 'bzr help working-trees'"""
80
 
        out, err = self.runbzr('help working-trees')
 
80
        out, err = self.run_bzr('help working-trees')
81
81
        self.assertEqual(bzrlib.help_topics._working_trees, out)
82
82
 
83
83
    def test_help_commands(self):
84
 
        dash_help  = self.runbzr('--help commands')[0]
85
 
        commands   = self.runbzr('help commands')[0]
86
 
        hidden = self.runbzr('help hidden-commands')[0]
87
 
        long_help  = self.runbzr('help --long')[0]
88
 
        qmark_long = self.runbzr('? --long')[0]
89
 
        qmark_cmds = self.runbzr('? commands')[0]
 
84
        dash_help  = self.run_bzr('--help commands')[0]
 
85
        commands   = self.run_bzr('help commands')[0]
 
86
        hidden = self.run_bzr('help hidden-commands')[0]
 
87
        long_help  = self.run_bzr('help --long')[0]
 
88
        qmark_long = self.run_bzr('? --long')[0]
 
89
        qmark_cmds = self.run_bzr('? commands')[0]
90
90
        self.assertEquals(dash_help, commands)
91
91
        self.assertEquals(dash_help, long_help)
92
92
        self.assertEquals(dash_help, qmark_long)
93
93
        self.assertEquals(dash_help, qmark_cmds)
94
94
 
95
95
    def test_hidden(self):
96
 
        commands = self.runbzr('help commands')[0]
97
 
        hidden = self.runbzr('help hidden-commands')[0]
 
96
        commands = self.run_bzr('help commands')[0]
 
97
        hidden = self.run_bzr('help hidden-commands')[0]
98
98
        self.assertTrue('commit' in commands)
99
99
        self.assertTrue('commit' not in hidden)
100
100
        self.assertTrue('rocks' in hidden)
101
101
        self.assertTrue('rocks' not in commands)
102
102
 
103
103
    def test_help_detail(self):
104
 
        dash_h  = self.runbzr('commit -h')[0]
105
 
        help_x  = self.runbzr('help commit')[0]
106
 
        qmark_x = self.runbzr('help commit')[0]
 
104
        dash_h  = self.run_bzr('commit -h')[0]
 
105
        help_x  = self.run_bzr('help commit')[0]
 
106
        qmark_x = self.run_bzr('help commit')[0]
107
107
        self.assertEquals(dash_h, help_x)
108
108
        self.assertEquals(dash_h, qmark_x)
109
109
 
110
110
    def test_help_help(self):
111
 
        help = self.runbzr('help help')[0]
112
 
        qmark = self.runbzr('? ?')[0]
 
111
        help = self.run_bzr('help help')[0]
 
112
        qmark = self.run_bzr('? ?')[0]
113
113
        self.assertEquals(help, qmark)
114
114
        for line in help.split('\n'):
115
115
            if '--long' in line: