diff options
Diffstat (limited to 'qtip')
| -rw-r--r-- | qtip/collector/logfile.py | 11 | ||||
| -rw-r--r-- | qtip/driver/sample.py | 15 | ||||
| -rw-r--r-- | qtip/driver/yardstick.py | 14 | ||||
| -rw-r--r-- | qtip/loader/file.py | 7 |
4 files changed, 9 insertions, 38 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): diff --git a/qtip/driver/sample.py b/qtip/driver/sample.py deleted file mode 100644 index 9b347949..00000000 --- a/qtip/driver/sample.py +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################## -# Copyright (c) 2016 ZTE Corp and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - -from base import BaseDriver - - -class SampleDriver(BaseDriver): - """sample driver that generates random data for testing""" diff --git a/qtip/driver/yardstick.py b/qtip/driver/yardstick.py deleted file mode 100644 index 83f1b3d8..00000000 --- a/qtip/driver/yardstick.py +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################## -# Copyright (c) 2016 ZTE Corp and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -from base import BaseDriver - - -class YardstickDriver(BaseDriver): - """driver for running performance test with yardstick""" diff --git a/qtip/loader/file.py b/qtip/loader/file.py index 038f57dd..a39e15f6 100644 --- a/qtip/loader/file.py +++ b/qtip/loader/file.py @@ -28,11 +28,12 @@ class FileLoader(BaseLoader): self._filename = name self.abspath = self.find(name, paths=paths) - def find(self, name, paths=None): + @classmethod + def find(cls, name, paths=None): """find a specification in searching paths""" - paths = [self.abspath] if paths is None else paths + paths = cls._paths if paths is None else paths for p in paths: - abspath = path.join(p, self.RELATIVE_PATH, name) + abspath = path.join(p, cls.RELATIVE_PATH, name) if path.exists(abspath): return abspath raise NotFoundError(name, paths) |