diff options
author | Thibault Saunier <thibault.saunier@collabora.com> | 2012-06-27 11:13:43 -0400 |
---|---|---|
committer | Thibault Saunier <thibault.saunier@collabora.com> | 2012-06-27 12:29:45 -0400 |
commit | 1deffc9ccdd2ba715b240d9dfa48488e1ef0eba7 (patch) | |
tree | 6a69ec2bee7bce8e9b39da7016a46be1595a929c | |
parent | 9086ea69324212dad8af9f52d92477c221b65dbb (diff) |
insanity: Refactoring in TerminalRedirectionMonitor
-rw-r--r-- | insanity/monitor.py | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/insanity/monitor.py b/insanity/monitor.py index 495b352..27f4704 100644 --- a/insanity/monitor.py +++ b/insanity/monitor.py @@ -525,7 +525,7 @@ class TerminalRedirectionMonitor(Monitor): def setUp(self): Monitor.setUp(self) - self._files, self._paths = self._start() + self._files, self._paths = self._start(True) for desc, path in self._paths.iteritems(): self.setOutputFile("global-" + desc, self._compressFile(path, False)) self._it_files = [] @@ -533,7 +533,21 @@ class TerminalRedirectionMonitor(Monitor): return True - def _start(self): + def _getTempFiles(self, basename, default_name, glob, category): + if basename is None: + nameid = default_name + else: + nameid = basename + + if glob: + nameid = "global-" + nameid + + if category: + return self.testrun.get_temp_file(nameid=nameid, category=category) + else: + return self.testrun.get_temp_file(nameid=nameid) + + def _start(self, glob): desc = self.arguments.get("desc") basename = self.arguments.get("outputfile-basename") category = self.arguments.get("category") @@ -548,43 +562,20 @@ class TerminalRedirectionMonitor(Monitor): return False if 'stderr' in desc: - if basename is None: - nameid = "stderr" - else: - nameid = basename - - if category: - stderr_file, stderr_path = self.testrun.get_temp_file(nameid=nameid, category=category) - else: - stderr_file, stderr_path = self.testrun.get_temp_file(nameid=nameid) + stderr_file, stderr_path = self._getTempFiles(basename, "stderr", glob, category) self.test.setStderr(stderr_file) files.append(stderr_file) paths["stderr-file"] = stderr_path if 'stdout' in desc: - if basename is None: - nameid = "stdout" - else: - nameid = basename - if category: - stdout_file, stdout_path = self.testrun.get_temp_file(nameid=nameid, category=category) - else: - stdout_file, stdout_path = self.testrun.get_temp_file(nameid=nameid) + stdout_file, stdout_path = self._getTempFiles(basename, "stdout", glob, category) self.test.setStdout(stdout_file) files.append(stdout_file) paths["stdout-file"] = stdout_path else: - if basename is None: - nameid = "stdoutanderr" - else: - nameid = basename - - if category: - _file, path = self.testrun.get_temp_file(nameid=nameid, category=category) - else: - _file, path = self.testrun.get_temp_file(nameid=nameid) + _file, path = self._getTempFiles(basename, "stdoutanderr", glob, category) self.test.setStdOutAndErr(path) files.append(_file) @@ -597,7 +588,7 @@ class TerminalRedirectionMonitor(Monitor): return Monitor.start(self, iteration) - self._it_files, self._it_paths = self._start() + self._it_files, self._it_paths = self._start(False) return True def stop(self): |