~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-02-27 12:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 5061.
  • Revision ID: robertc@robertcollins.net-20100227122733-2o3me3fkk3pk36ns
``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
``message_callback`` in the same way that commit does. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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,
1232
 
            target_branch=co_branch)
 
1231
        branch.BranchReferenceFormat().initialize(lco_dir, co_branch)
1233
1232
        lco_dir.create_workingtree()
1234
1233
        lco_tree = lco_dir.open_workingtree()
1235
1234
 
1325
1324
 
1326
1325
    def test_info_locking_oslocks(self):
1327
1326
        if sys.platform == "win32":
1328
 
            self.skip("don't use oslocks on win32 in unix manner")
 
1327
            raise TestSkipped("don't use oslocks on win32 in unix manner")
1329
1328
        # This test tests old (all-in-one, OS lock using) behaviour which
1330
1329
        # simply cannot work on windows (and is indeed why we changed our
1331
1330
        # design. As such, don't try to remove the thisFailsStrictLockCheck