← 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: 2010-09-29 22:03:03 UTC
  • mfrom: (5416.2.6 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100929220303-cr95h8iwtggco721
(mbp) Add 'break-lock --force'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
1228
1228
        # Do a light checkout of the heavy one
1229
1229
        transport.mkdir('tree/lightcheckout')
1230
1230
        lco_dir = bzrdir.BzrDirMetaFormat1().initialize('tree/lightcheckout')
1231
 
        branch.BranchReferenceFormat().initialize(lco_dir, co_branch)
 
1231
        branch.BranchReferenceFormat().initialize(lco_dir,
 
1232
            target_branch=co_branch)
1232
1233
        lco_dir.create_workingtree()
1233
1234
        lco_tree = lco_dir.open_workingtree()
1234
1235
 
1324
1325
 
1325
1326
    def test_info_locking_oslocks(self):
1326
1327
        if sys.platform == "win32":
1327
 
            raise TestSkipped("don't use oslocks on win32 in unix manner")
 
1328
            self.skip("don't use oslocks on win32 in unix manner")
1328
1329
        # This test tests old (all-in-one, OS lock using) behaviour which
1329
1330
        # simply cannot work on windows (and is indeed why we changed our
1330
1331
        # design. As such, don't try to remove the thisFailsStrictLockCheck