← 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: Jelmer Vernooij
  • Date: 2011-05-10 07:46:15 UTC
  • mfrom: (5844 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5845.
  • Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_version.py
108
108
        bzr_log = 'my.bzr.log'
109
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
124
124
            bzr_log = '/dev/null'
125
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)