diff options
Diffstat (limited to 'test/test_farm.py')
| -rw-r--r-- | test/test_farm.py | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/test/test_farm.py b/test/test_farm.py index fa456302..98f44379 100644 --- a/test/test_farm.py +++ b/test/test_farm.py @@ -58,7 +58,7 @@ class FarmTestCase(object): cwd = self.cd(self.dir) # Prepare a dictionary of globals for the run.py files to use. - fns = "copy run runfunc compare contains clean".split() + fns = "copy run runfunc compare contains doesnt_contain clean".split() if self.clean_only: glo = dict([(fn, self.noop) for fn in fns]) glo['clean'] = self.clean @@ -122,16 +122,19 @@ class FarmTestCase(object): shutil.rmtree(dst) shutil.copytree(src, dst) - def run(self, cmds, rundir="src"): + def run(self, cmds, rundir="src", outfile=None): """Run a list of commands. `cmds` is a string, commands separated by newlines. `rundir` is the directory in which to run the commands. + `outfile` is a filename to redirect stdout to. """ cwd = self.cd(rundir) try: for cmd in cmds.split("\n"): + if not cmd.strip(): + continue if subprocess: proc = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, @@ -143,6 +146,8 @@ class FarmTestCase(object): output = stdouterr.read() retcode = 0 # Can't tell if the process failed. print output, + if outfile: + open(outfile, "a+").write(output) if retcode: raise Exception("command exited abnormally") finally: @@ -234,6 +239,17 @@ class FarmTestCase(object): for s in strlist: assert s in text, "Missing content in %s: %r" % (filename, s) + def doesnt_contain(self, filename, *strlist): + """Check that the file contains none of a list of strings. + + An assert will be raised if any of the strings in strlist appears in + `filename`. + + """ + text = open(filename, "r").read() + for s in strlist: + assert s not in text, "Forbidden content in %s: %r" % (filename, s) + def clean(self, cleandir): """Clean `cleandir` by removing it and all its children completely.""" if os.path.exists(cleandir): |