← 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-10-07 12:45:51 UTC
  • mfrom: (5459.4.1 561061-ssh-protocol)
  • Revision ID: pqm@pqm.ubuntu.com-20101007124551-zfqhlkqdegiy7otp
(vila) Don't force openssh to use protocol=2 (Neil Martinsen-Burrell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
212
212
         0 added
213
213
         0 removed
214
214
         0 renamed
215
 
         1 unknown
216
 
         0 ignored
 
215
         0 unknown
 
216
         1 ignored
217
217
         0 versioned subdirectories
218
218
 
219
219
Branch history:
380
380
         0 added
381
381
         0 removed
382
382
         0 renamed
383
 
         1 unknown
384
 
         0 ignored
 
383
         0 unknown
 
384
         1 ignored
385
385
         0 versioned subdirectories
386
386
 
387
387
Branch history:
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