← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2006-07-31 14:10:08 UTC
  • mto: (1946.2.6 reduce-knit-churn)
  • mto: This revision was merged to the branch mainline in revision 1905.
  • Revision ID: john@arbash-meinel.com-20060731141008-e3092f038192c8a7
re-enable a skipped update test, and clean it up

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
55
55
    def test_update_out_of_date_standalone_tree(self):
56
56
        # FIXME the default format has to change for this to pass
57
57
        # because it currently uses the branch last-revision marker.
58
 
        raise TestSkipped('default format too old')
59
58
        self.make_branch_and_tree('branch')
60
59
        # make a checkout
61
60
        self.runbzr('checkout --lightweight branch checkout')
64
63
        self.runbzr('commit -m add-file checkout')
65
64
        # now branch should be out of date
66
65
        out,err = self.runbzr('update branch')
67
 
        self.assertEqual('Updated to revision 1.\n', out)
68
 
        self.assertEqual('', err)
 
66
        self.assertEqual('', out)
 
67
        self.assertEqual('All changes applied successfully.\n'
 
68
                         'Updated to revision 1.\n', err)
69
69
        self.failUnlessExists('branch/file')
70
70
 
71
71
    def test_update_out_of_date_light_checkout(self):