← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-19 00:32:14 UTC
  • mfrom: (4685.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090919003214-2dli9jc4y5xhjj3n
(mbp for garyvdm) Revert rename of
        test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
29
29
    urlutils,
30
30
    )
31
31
from bzrlib.osutils import format_date
32
 
from bzrlib.tests import TestSkipped
 
32
from bzrlib.tests import TestSkipped, MemoryServer
33
33
from bzrlib.tests.blackbox import ExternalBase
34
34
 
35
35
 
40
40
        self._repo_strings = "2a or development-subtree"
41
41
 
42
42
    def test_info_non_existing(self):
43
 
        if sys.platform == "win32":
44
 
            location = "C:/i/do/not/exist/"
45
 
        else:
46
 
            location = "/i/do/not/exist/"
 
43
        self.vfs_transport_factory = MemoryServer
 
44
        location = self.get_url()
47
45
        out, err = self.run_bzr('info '+location, retcode=3)
48
46
        self.assertEqual(out, '')
49
47
        self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
1328
1326
    def test_info_locking_oslocks(self):
1329
1327
        if sys.platform == "win32":
1330
1328
            raise TestSkipped("don't use oslocks on win32 in unix manner")
 
1329
        # This test tests old (all-in-one, OS lock using) behaviour which
 
1330
        # simply cannot work on windows (and is indeed why we changed our
 
1331
        # design. As such, don't try to remove the thisFailsStrictLockCheck
 
1332
        # call here.
1331
1333
        self.thisFailsStrictLockCheck()
1332
1334
 
1333
1335
        tree = self.make_branch_and_tree('branch',