← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/script.py

  • Committer: Martin Pool
  • Date: 2010-09-13 04:41:17 UTC
  • mfrom: (5417.1.2 scripts)
  • mto: This revision was merged to the branch mainline in revision 5426.
  • Revision ID: mbp@sourcefrog.net-20100913044117-2wmxp0ahf4ptz0uf
Merge ScriptRunner interaction support

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/script.py
232
232
            # 'expected' parameter. So we just fallback to our good old
233
233
            # assertEqualDiff since we know there *are* differences and the
234
234
            # output should be decently readable.
235
 
            test_case.assertEqualDiff(expected, actual)
 
235
            #
 
236
            # As a special case, we allow output that's missing a final
 
237
            # newline to match an expected string that does have one, so that
 
238
            # we can match a prompt printed on one line, then input given on
 
239
            # the next line.
 
240
            if expected == actual + '\n':
 
241
                pass
 
242
            else:
 
243
                test_case.assertEqualDiff(expected, actual)
236
244
 
237
245
    def _pre_process_args(self, args):
238
246
        new_args = []