← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_export.py
187
187
        tree.add('goodbye')
188
188
        tree.commit('setup')
189
189
        return tree
190
 
        
 
190
 
191
191
    def test_basic_directory_export(self):
192
192
        self.example_branch()
193
193
        os.chdir('branch')
262
262
            self.assertEqual('foo', zf.read('pizza/hello'))
263
263
        finally:
264
264
            zf.close()
265
 
        
 
265
 
266
266
        self.run_bzr('export ../first-zip --format=zip -r 1')
267
267
        zf = zipfile.ZipFile('../first-zip')
268
268
        try: