python-cmd2: cmd2.py comparison

comparison cmd2.py @ 253:24289178b367

midway through allowing multiple testing files

author	Catherine Devlin <catherine.devlin@gmail.com>
date	Tue, 31 Mar 2009 17:47:04 -0400
parents	bc6dec08275f
children	07dff0ba981e

comparison

equal deleted inserted replaced

-:b1b37ea258af
+:24289178b367
 CHANGES:
 As of 0.3.0, options should be specified as `optparse` options.  See README.txt.
 flagReader.py options are still supported for backward compatibility
 """
 import cmd, re, os, sys, optparse, subprocess, tempfile, pyparsing, doctest
-import unittest, string, datetime, urllib
+import unittest, string, datetime, urllib, glob
 from code import InteractiveConsole, InteractiveInterpreter, softspace
 from optparse import make_option
 __version__ = '0.5.1'
 class OptionParser(optparse.OptionParser):
 '''Subclass this, setting CmdApp and transcriptFileName, to make a unittest.TestCase class
 that will execute the commands in transcriptFileName and expect the results shown.
 See example.py'''
 CmdApp = None
 transcriptFileName = ''
+transcriptExtension = ''
+def fetchTranscripts(self):
+self.transcripts = {}
+if self.transcriptExtension:
+for fname in glob.glob('*.' + self.transcriptExtension):
+tfile = open(fname)
+self.transcripts[fname] = iter(tfile.readlines())
+tfile.close()
+elif self.transcriptFileName:
+tfile = open(os.path.expanduser(self.transcriptFileName))
+self.transcripts = {'transcript': iter(tfile.readlines())}
+tfile.close()
+else:
+raise AttributeError, 'Cmd2TestCase must define transcriptFileName or transcriptExtension'
 def setUp(self):
 if self.CmdApp:
 self.outputTrap = OutputTrap()
 self.cmdapp = self.CmdApp()
-try:
+self.fetchTranscripts()
-tfile = open(os.path.expanduser(self.transcriptFileName))
-self.transcript = iter(tfile.readlines())
-tfile.close()
-except IOError:
-self.transcript = []
 def assertEqualEnough(self, got, expected, message):
 got = got.strip().splitlines()
 expected = expected.strip().splitlines()
 self.assertEqual(len(got), len(expected), message)
 for (linegot, lineexpected) in zip(got, expected):
 matchme = re.escape(lineexpected.strip()).replace('\\*', '.*').  \
 replace('\\ ', ' ')
 self.assert_(re.match(matchme, linegot.strip()), message)
 def testall(self):
 if self.CmdApp:
-lineNum = 0
+setup = 'setup.' + self.transcriptExtension
-try:
+teardown = 'teardown.' + self.transcriptExtension
-line = self.transcript.next()
+transcripts = self.transcripts.copy()
-while True:
+transcriptfiles = []
-while not line.startswith(self.cmdapp.prompt):
+if setup in transcripts:
-line = self.transcript.next()
+transcriptfiles.append((setup, transcripts.pop(setup)))
-command = [line[len(self.cmdapp.prompt):]]
+transcriptfiles.extend(sorted((fname, transcripts[fname]) for fname in transcripts if fname != teardown))
-line = self.transcript.next()
+if teardown in transcripts:
-while line.startswith(self.cmdapp.continuation_prompt):
+transcriptfiles.append((teardown, transcripts[teardown]))
-command.append(line[len(self.cmdapp.continuation_prompt):])
+for transcript in transcriptfiles:
-line = self.transcript.next()
+self.testone(transcript)
-command = ''.join(command)
+def testone(self, transcript):
-self.cmdapp.onecmd(command)
+lineNum = 0
-result = self.outputTrap.read()
+try:
-if line.startswith(self.cmdapp.prompt):
+line = transcript.next()
-self.assertEqualEnough(result.strip(), '',
+while True:
-'\nFile %s, line %d\nCommand was:\n%s\nExpected: (nothing) \nGot:\n%s\n' %
+while not line.startswith(self.cmdapp.prompt):
-(self.transcriptFileName, lineNum, command, result))
+line = transcript.next()
-continue
+command = [line[len(self.cmdapp.prompt):]]
-expected = []
+line = transcript.next()
-while not line.startswith(self.cmdapp.prompt):
+while line.startswith(self.cmdapp.continuation_prompt):
-expected.append(line)
+command.append(line[len(self.cmdapp.continuation_prompt):])
-line = self.transcript.next()
+line = transcript.next()
-expected = ''.join(expected)
+command = ''.join(command)
-self.assertEqualEnough(expected.strip(), result.strip(),
+self.cmdapp.onecmd(command)
-'\nFile %s, line %d\nCommand was:\n%s\nExpected:\n%s\nGot:\n%s\n' %
+result = self.outputTrap.read()
-(self.transcriptFileName, lineNum, command, expected, result))
+if line.startswith(self.cmdapp.prompt):
-# this needs to account for a line-by-line strip()ping
+self.assertEqualEnough(result.strip(), '',
-except StopIteration:
+'\nFile %s, line %d\nCommand was:\n%s\nExpected: (nothing) \nGot:\n%s\n' %
-pass
+(self.transcriptFileName, lineNum, command, result))
-# catch the final output?
+continue
+expected = []
+while not line.startswith(self.cmdapp.prompt):
+expected.append(line)
+line = transcript.next()
+expected = ''.join(expected)
+self.assertEqualEnough(expected.strip(), result.strip(),
+'\nFile %s, line %d\nCommand was:\n%s\nExpected:\n%s\nGot:\n%s\n' %
+(self.transcriptFileName, lineNum, command, expected, result))
+# this needs to account for a line-by-line strip()ping
+except StopIteration:
+pass
 def tearDown(self):
 if self.CmdApp:
 self.outputTrap.tearDown()
 if __name__ == '__main__':

Mercurial > python-cmd2

comparison cmd2.py @ 253:24289178b367