← 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: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_version.py
1
 
# Copyright (C) 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2007-2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
39
39
        output = self.run_bzr('version')[0]
40
40
        self.log('bzr version output:')
41
41
        self.log(output)
42
 
        self.assert_(output.startswith('Bazaar (bzr) '))
 
42
        self.assertTrue(output.startswith('Bazaar (bzr) '))
43
43
        self.assertNotEqual(output.index('Canonical'), -1)
44
44
        # make sure --version is consistent
45
45
        tmp_output = self.run_bzr('--version')[0]
46
 
        self.assertEquals(output, tmp_output)
 
46
        self.assertEqual(output, tmp_output)
47
47
 
48
48
    def test_version(self):
49
49
        self.permit_source_tree_branch_repo()
95
95
            raise TestSkipped('Cannot find a unicode character that works in'
96
96
                              ' encoding %s' % (osutils.get_user_encoding(),))
97
97
 
98
 
        osutils.set_or_unset_env('BZR_HOME', str_val)
 
98
        self.overrideEnv('BZR_HOME', str_val)
99
99
        self.permit_source_tree_branch_repo()
100
100
        out = self.run_bzr("version")[0]
101
101
        self.assertTrue(len(out) > 0)
106
106
 
107
107
    def test_simple(self):
108
108
        bzr_log = 'my.bzr.log'
109
 
        osutils.set_or_unset_env('BZR_LOG', bzr_log)
 
109
        self.overrideEnv('BZR_LOG', bzr_log)
110
110
        default_log = os.path.join(os.environ['BZR_HOME'], '.bzr.log')
111
 
        self.failIfExists([default_log, bzr_log])
 
111
        self.assertPathDoesNotExist([default_log, bzr_log])
112
112
        out = self.run_bzr_subprocess('version')[0]
113
113
        self.assertTrue(len(out) > 0)
114
114
        self.assertContainsRe(out, r"(?m)^  Bazaar log file: " + bzr_log)
115
 
        self.failIfExists(default_log)
116
 
        self.failUnlessExists(bzr_log)
 
115
        self.assertPathDoesNotExist(default_log)
 
116
        self.assertPathExists(bzr_log)
117
117
 
118
118
    def test_dev_null(self):
119
119
        # This test uses a subprocess to cause the log opening logic to
122
122
            bzr_log = 'NUL'
123
123
        else:
124
124
            bzr_log = '/dev/null'
125
 
        osutils.set_or_unset_env('BZR_LOG', bzr_log)
 
125
        self.overrideEnv('BZR_LOG', bzr_log)
126
126
        default_log = os.path.join(os.environ['BZR_HOME'], '.bzr.log')
127
 
        self.failIfExists(default_log)
 
127
        self.assertPathDoesNotExist(default_log)
128
128
        out = self.run_bzr_subprocess('version')[0]
129
129
        self.assertTrue(len(out) > 0)
130
130
        self.assertContainsRe(out, r"(?m)^  Bazaar log file: " + bzr_log)
131
 
        self.failIfExists(default_log)
 
131
        self.assertPathDoesNotExist(default_log)
 
132
 
 
133
    def test_unicode_bzr_log(self):
 
134
        uni_val = u"\xa7"
 
135
        enc = osutils.get_user_encoding()
 
136
        try:
 
137
            str_val = uni_val.encode(enc)
 
138
        except UnicodeEncodeError:
 
139
            self.skip("Test string %r unrepresentable in user encoding %s" % (
 
140
                uni_val, enc))
 
141
        self.overrideEnv('BZR_HOME', self.test_base_dir)
 
142
        self.overrideEnv("BZR_LOG",
 
143
            os.path.join(self.test_base_dir, uni_val).encode(enc))
 
144
        out, err = self.run_bzr_subprocess("version")
 
145
        uni_out = out.decode(enc)
 
146
        self.assertContainsRe(uni_out, u"(?m)^  Bazaar log file: .*/\xa7$")
 
147
 
 
148