← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_shared_repository.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
88
88
        cdir = BzrDir.open('a/c')
89
89
        cdir.open_branch()
90
90
        self.assertRaises(errors.NoRepositoryPresent, cdir.open_repository)
91
 
        self.failUnlessExists('a/c/hello')
 
91
        self.assertPathExists('a/c/hello')
92
92
        cdir.open_workingtree()
93
93
 
94
94
    def test_trees_default(self):
155
155
        # and uses whoami only in a lock file. Without whoami the login name
156
156
        # is used. This test is to ensure that init-repo passes even when whoami
157
157
        # is not available.
158
 
        osutils.set_or_unset_env('EMAIL', None)
159
 
        osutils.set_or_unset_env('BZR_EMAIL', None)
 
158
        self.overrideEnv('EMAIL', None)
 
159
        self.overrideEnv('BZR_EMAIL', None)
160
160
        out, err = self.run_bzr(['init-repo', 'foo'])
161
161
        self.assertEqual(err, '')
162
162
        self.assertTrue(os.path.exists('foo'))