← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/blackbox.py

  • Committer: Aaron Bentley
  • Date: 2007-06-12 22:09:44 UTC
  • mfrom: (540.1.2 bzrtools-0.17)
  • Revision ID: aaron.bentley@utoronto.ca-20070612220944-5zw4hlzp1ctq6mkl
Merge fixes from 0.17

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/blackbox.py
57
57
        file('mypatch', 'wb').write(self.runbzr('diff', retcode=1, backtick=1))
58
58
        self.runbzr('revert')
59
59
        assert file('myfile', 'rb').read() == 'hello'
60
 
        self.runbzr('patch mypatch')
 
60
        self.runbzr('patch --silent mypatch')
61
61
        assert file('myfile', 'rb').read() == 'goodbye'
62
62
 
63
63
    def test_branch_history(self):
128
128
        self.runbzr('commit -m hello')
129
129
        self.runbzr('export ../source-0.1.tar.gz')
130
130
        self.runbzr('export ../source-0.1.tar.bz2')
 
131
        self.runbzr('export ../source-0.1')
131
132
        self.runbzr('init ../import')
132
133
        os.chdir('../import')
133
134
        self.runbzr('import ../source-0.1.tar.gz')
144
145
        self.failUnlessExists('import3/src/myfile')
145
146
        self.runbzr('import source-0.1.tar.bz2 import4')
146
147
        self.failUnlessExists('import4/src/myfile')
 
148
        self.runbzr('import source-0.1 import5')
 
149
        self.failUnlessExists('import5/src/myfile')
147
150
 
148
151
def test_suite():
149
152
    return makeSuite(TestBzrTools)