← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/script.py

  • Committer: John Arbash Meinel
  • Date: 2010-11-05 20:54:32 UTC
  • mfrom: (5526 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5527.
  • Revision ID: john@arbash-meinel.com-20101105205432-rmyozu8sthyhmri8
Merge bzr.dev to resolve bzr-2.3.txt (aka NEWS)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/script.py
28
28
from cStringIO import StringIO
29
29
 
30
30
from bzrlib import (
 
31
    errors,
31
32
    osutils,
32
33
    tests,
33
34
    )
212
213
        method = getattr(self, mname, None)
213
214
        if method is None:
214
215
            raise SyntaxError('Command not found "%s"' % (cmd[0],),
215
 
                              None, 1, ' '.join(cmd))
 
216
                              (None, 1, 1, ' '.join(cmd)))
216
217
        if input is None:
217
218
            str_input = ''
218
219
        else:
511
512
def run_script(test_case, script_string):
512
513
    """Run the given script within a testcase"""
513
514
    return ScriptRunner().run_script(test_case, script_string)
 
515