diff options
author | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-02-23 20:51:38 +0800 |
---|---|---|
committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-02-24 11:19:17 +0800 |
commit | 245b6f4070d1b3b5124a184cb6442b55000fd321 (patch) | |
tree | 975a60229a1341a0cc2ea978943b2614b2ee099f /qtip/collector | |
parent | 452969c058a2f3f3327036b93cbc4bba4d7c574e (diff) |
Fix bug when no paths is given for Plan constructor
FileLoader was trying to initialize abspath by finding a matched
name from abspath which will lead to an exception. Use default
paths of class instead.
Change-Id: I8ca2122e97edd734aa68b4c6b12196960842313b
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'qtip/collector')
-rw-r--r-- | qtip/collector/logfile.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/qtip/collector/logfile.py b/qtip/collector/logfile.py index 2c2e532f..5f0951cb 100644 --- a/qtip/collector/logfile.py +++ b/qtip/collector/logfile.py @@ -18,8 +18,8 @@ from qtip.loader.file import FileLoader class LogItem(BaseActor): - def find(self, filename, paths=None): - return self._parent.find(filename, paths) + def find(self, filename): + return self._parent.find(filename) class LogfileCollector(BaseActor): @@ -33,8 +33,7 @@ class LogfileCollector(BaseActor): self._parent = parent # plan # TODO(yujunz) handle exception of invalid parent dirname = os.path.dirname(self._parent.abspath) - paths = [os.path.join(dirname, p) for p in config.get(self.PATHS, [])] - self._loader = FileLoader('.', paths) + self.paths = [os.path.join(dirname, p) for p in config.get(self.PATHS, [])] def run(self): collected = [] @@ -45,8 +44,8 @@ class LogfileCollector(BaseActor): collected = chain(collected, reduce(chain, matches)) return reduce(merge_matchobj_to_dict, collected, {'groups': (), 'groupdict': {}}) - def find(self, filename, paths=None): - return self._loader.find(filename, paths) + def find(self, filename): + return FileLoader.find(filename, self.paths) def merge_matchobj_to_dict(d, m): |