← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests.py

  • Committer: Michael Ellerman
  • Date: 2006-02-12 03:47:20 UTC
  • mto: (0.1.73 shelf-tmp)
  • mto: This revision was merged to the branch mainline in revision 334.
  • Revision ID: michael@ellerman.id.au-20060212034720-1482cf30017f2ec7
Infrastructure to allow for multiple interchangeable shelves.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests.py
60
60
            self.assertEqual(file('test_file').read(), self.ORIGINAL)
61
61
 
62
62
            # Check the shelf is right
63
 
            shelf = open(os.path.join(b.base, '.shelf/default/00')).read()
 
63
            shelf = open(os.path.join(b.base, '.shelf/shelves/default/00')).read()
64
64
            shelf = shelf[shelf.index('\n') + 1:] # skip the message
65
65
            self.assertEqual(shelf, self.DIFF_1)
66
66
 
87
87
        # Shelve the changes
88
88
        self.run_bzr('shelve', retcode=3)
89
89
 
90
 
        if os.path.exists(os.path.join(b.base, '.shelf/default/00')):
 
90
        if os.path.exists(os.path.join(b.base, '.shelf/shelves/default/00')):
91
91
            self.fail("Shelf exists, but it shouldn't")
92
92
 
93
93
    def test_shelf_with_revision(self):