← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf_ui.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-06-10 16:19:57 UTC
  • mfrom: (5954.2.7 merge-into-empty-fixups)
  • Revision ID: pqm@pqm.ubuntu.com-20110610161957-hh5ni839m7r3wsan
Cleanups and fixes for merging into null tree. (Aaron Bentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
63
63
LINES_AY = 'a\nb\nc\nd\ne\nf\ng\nh\ni\ny\n'
64
64
 
65
65
 
66
 
class TestShelver(tests.TestCaseWithTransport):
 
66
class ShelfTestCase(tests.TestCaseWithTransport):
67
67
 
68
68
    def create_shelvable_tree(self):
69
69
        tree = self.make_branch_and_tree('tree')
73
73
        self.build_tree_contents([('tree/foo', LINES_ZY)])
74
74
        return tree
75
75
 
 
76
 
 
77
class TestShelver(ShelfTestCase):
 
78
 
76
79
    def test_unexpected_prompt_failure(self):
77
80
        tree = self.create_shelvable_tree()
78
81
        tree.lock_tree_write()
327
330
                           outer_tree, rev2)
328
331
 
329
332
 
330
 
class TestApplyReporter(TestShelver):
 
333
class TestApplyReporter(ShelfTestCase):
331
334
 
332
335
    def test_shelve_not_diff(self):
333
336
        tree = self.create_shelvable_tree()