← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_update.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
19
19
    errors,
20
20
    revision as _mod_revision,
21
21
    )
22
 
from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch
 
22
from bzrlib.tests import per_branch
23
23
 
24
24
 
25
25
"""Tests for branch.update()"""
26
26
 
27
27
 
28
 
class TestUpdate(TestCaseWithBranch):
 
28
class TestUpdate(per_branch.TestCaseWithBranch):
29
29
 
30
30
    def test_update_unbound_works(self):
31
31
        b = self.make_branch('.')
69
69
        self.assertEqual(['bar'], child_tree.branch.revision_history())
70
70
 
71
71
 
72
 
class TestUpdateRevisions(TestCaseWithBranch):
 
72
class TestUpdateRevisions(per_branch.TestCaseWithBranch):
73
73
 
74
74
    def test_accepts_graph(self):
75
75
        # An implementation may not use it, but it should allow a 'graph' to be