← 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: v.ladeuil+lp at free
  • Date: 2007-05-18 18:20:31 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070518182031-gbg2cgidv5l20x9p
Takes Robert comments into account.

* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Write a better explanation.

* bzrlib/tests/test_init.py:
(InstrumentedTransport): Just make hooks a class attribute.
(InstrumentedTransport._get_FTP): Run hook directly in the for
loop.
(TransportHooks.run_hook, TransportHooks.uninstall_hook): Not
needed. The hooks should be cleaned up by the test itself.
(TestInit.setUp.cleanup): Resset to default hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_help.py
19
19
"""
20
20
 
21
21
 
22
 
import bzrlib
23
22
from bzrlib.tests.blackbox import ExternalBase
24
23
 
25
24
 
27
26
 
28
27
    def test_help_basic(self):
29
28
        for cmd in ['--help', 'help', '-h', '-?']:
30
 
            output = self.run_bzr(cmd)[0]
 
29
            output = self.runbzr(cmd)[0]
31
30
            line1 = output.split('\n')[0]
32
31
            if not line1.startswith('Bazaar'):
33
32
                self.fail("bad output from bzr %s:\n%r" % (cmd, output))
35
34
 
36
35
    def test_help_topics(self):
37
36
        """Smoketest for 'bzr help topics'"""
38
 
        out, err = self.run_bzr('help topics')
 
37
        out, err = self.run_bzr('help', 'topics')
39
38
        self.assertContainsRe(out, 'basic')
40
39
        self.assertContainsRe(out, 'topics')
41
40
        self.assertContainsRe(out, 'commands')
43
42
 
44
43
    def test_help_revisionspec(self):
45
44
        """Smoke test for 'bzr help revisionspec'"""
46
 
        out, err = self.run_bzr('help revisionspec')
 
45
        out, err = self.run_bzr('help', 'revisionspec')
47
46
        self.assertContainsRe(out, 'revno:')
48
47
        self.assertContainsRe(out, 'date:')
49
48
        self.assertContainsRe(out, 'revid:')
54
53
 
55
54
    def test_help_checkouts(self):
56
55
        """Smoke test for 'bzr help checkouts'"""
57
 
        out, err = self.run_bzr('help checkouts')
 
56
        out, err = self.runbzr('help checkouts')
58
57
        self.assertContainsRe(out, 'checkout')
59
58
        self.assertContainsRe(out, 'lightweight')
60
59
        
61
60
    def test_help_urlspec(self):
62
61
        """Smoke test for 'bzr help urlspec'"""
63
 
        out, err = self.run_bzr('help urlspec')
 
62
        out, err = self.run_bzr('help', 'urlspec')
64
63
        self.assertContainsRe(out, 'aftp://')
65
64
        self.assertContainsRe(out, 'bzr://')
66
65
        self.assertContainsRe(out, 'bzr\+ssh://')
70
69
        self.assertContainsRe(out, 'https://')
71
70
        self.assertContainsRe(out, 'sftp://')
72
71
 
73
 
    def test_help_repositories(self):
74
 
        """Smoke test for 'bzr help repositories'"""
75
 
        out, err = self.run_bzr('help repositories')
76
 
        self.assertEqual(bzrlib.help_topics._repositories, out)
77
 
 
78
 
    def test_help_working_trees(self):
79
 
        """Smoke test for 'bzr help working-trees'"""
80
 
        out, err = self.run_bzr('help working-trees')
81
 
        self.assertEqual(bzrlib.help_topics._working_trees, out)
82
 
 
83
 
    def test_help_status_flags(self):
84
 
        """Smoke test for 'bzr help status-flags'"""
85
 
        out, err = self.run_bzr('help status-flags')
86
 
        self.assertEqual(bzrlib.help_topics._status_flags, out)
87
 
 
88
72
    def test_help_commands(self):
89
 
        dash_help  = self.run_bzr('--help commands')[0]
90
 
        commands   = self.run_bzr('help commands')[0]
91
 
        hidden = self.run_bzr('help hidden-commands')[0]
92
 
        long_help  = self.run_bzr('help --long')[0]
93
 
        qmark_long = self.run_bzr('? --long')[0]
94
 
        qmark_cmds = self.run_bzr('? commands')[0]
 
73
        dash_help  = self.runbzr('--help commands')[0]
 
74
        commands   = self.runbzr('help commands')[0]
 
75
        hidden = self.runbzr('help hidden-commands')[0]
 
76
        long_help  = self.runbzr('help --long')[0]
 
77
        qmark_long = self.runbzr('? --long')[0]
 
78
        qmark_cmds = self.runbzr('? commands')[0]
95
79
        self.assertEquals(dash_help, commands)
96
80
        self.assertEquals(dash_help, long_help)
97
81
        self.assertEquals(dash_help, qmark_long)
98
82
        self.assertEquals(dash_help, qmark_cmds)
99
83
 
100
84
    def test_hidden(self):
101
 
        commands = self.run_bzr('help commands')[0]
102
 
        hidden = self.run_bzr('help hidden-commands')[0]
 
85
        commands = self.runbzr('help commands')[0]
 
86
        hidden = self.runbzr('help hidden-commands')[0]
103
87
        self.assertTrue('commit' in commands)
104
88
        self.assertTrue('commit' not in hidden)
105
89
        self.assertTrue('rocks' in hidden)
106
90
        self.assertTrue('rocks' not in commands)
107
91
 
108
92
    def test_help_detail(self):
109
 
        dash_h  = self.run_bzr('commit -h')[0]
110
 
        help_x  = self.run_bzr('help commit')[0]
111
 
        qmark_x = self.run_bzr('help commit')[0]
 
93
        dash_h  = self.runbzr('commit -h')[0]
 
94
        help_x  = self.runbzr('help commit')[0]
 
95
        qmark_x = self.runbzr('help commit')[0]
112
96
        self.assertEquals(dash_h, help_x)
113
97
        self.assertEquals(dash_h, qmark_x)
114
98
 
115
99
    def test_help_help(self):
116
 
        help = self.run_bzr('help help')[0]
117
 
        qmark = self.run_bzr('? ?')[0]
 
100
        help = self.runbzr('help help')[0]
 
101
        qmark = self.runbzr('? ?')[0]
118
102
        self.assertEquals(help, qmark)
119
103
        for line in help.split('\n'):
120
104
            if '--long' in line:
121
 
                self.assertContainsRe(line,
122
 
                    r'Show help on all commands\.')
 
105
                self.assertTrue('show help on all commands' in line)