← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Matthew Fuller
  • Date: 2009-08-18 08:10:44 UTC
  • mto: (4772.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4773.
  • Revision ID: fullermd@over-yonder.net-20090818081044-2due6ius01c4pwjl
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
instead of RS_revno, and ending up as _dwim's (which may error
eventually, but won't until we try to evaluate them) instead of
insta-errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_version.py
31
31
 
32
32
class TestVersion(TestCase):
33
33
 
34
 
    def test_main_version(self):
35
 
        """Check output from version command and master option is reasonable"""
36
 
        # output is intentionally passed through to stdout so that we
37
 
        # can see the version being tested
38
 
        self.permit_source_tree_branch_repo()
39
 
        output = self.run_bzr('version')[0]
40
 
        self.log('bzr version output:')
41
 
        self.log(output)
42
 
        self.assert_(output.startswith('Bazaar (bzr) '))
43
 
        self.assertNotEqual(output.index('Canonical'), -1)
44
 
        # make sure --version is consistent
45
 
        tmp_output = self.run_bzr('--version')[0]
46
 
        self.assertEquals(output, tmp_output)
47
 
 
48
34
    def test_version(self):
49
 
        self.permit_source_tree_branch_repo()
50
35
        out = self.run_bzr("version")[0]
51
36
        self.assertTrue(len(out) > 0)
52
37
        self.assertEqualDiff(out.splitlines()[0],
58
43
        self.assertContainsRe(out, r'(?m)^  Bazaar log file:.*\.bzr\.log')
59
44
 
60
45
    def test_version_short(self):
61
 
        self.permit_source_tree_branch_repo()
62
46
        out = self.run_bzr(["version", "--short"])[0]
63
47
        self.assertEqualDiff(out, bzrlib.version_string + '\n')
64
48
 
66
50
class TestVersionUnicodeOutput(TestCaseInTempDir):
67
51
 
68
52
    def _check(self, args):
69
 
        self.permit_source_tree_branch_repo()
70
53
        # Even though trace._bzr_log_filename variable
71
54
        # is used only to keep actual log filename
72
55
        # and changing this variable in selftest
96
79
                              ' encoding %s' % (osutils.get_user_encoding(),))
97
80
 
98
81
        osutils.set_or_unset_env('BZR_HOME', str_val)
99
 
        self.permit_source_tree_branch_repo()
100
82
        out = self.run_bzr("version")[0]
101
83
        self.assertTrue(len(out) > 0)
102
84
        self.assertContainsRe(out, r"(?m)^  Bazaar configuration: " + str_val)
116
98
        self.failUnlessExists(bzr_log)
117
99
 
118
100
    def test_dev_null(self):
119
 
        # This test uses a subprocess to cause the log opening logic to
120
 
        # execute. It would be better to just execute that logic directly.
121
101
        if sys.platform == 'win32':
122
102
            bzr_log = 'NUL'
123
103
        else: