summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhongbo tian <hongbo.tianhongbo@huawei.com>2017-02-08 03:11:00 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-08 03:11:00 +0000
commit29500fcfd71ae240dd9258378328483f02f916eb (patch)
tree0916de57878bdf88eb55e153540d372cec717743
parentf15a0e3445a6d73694ebb4bf67aa01c8a98de4f8 (diff)
parent9f4ce551bacb18bf424b0164a82cafb954f4b7c4 (diff)
Merge "dovetail tool: use python new-style classes which inherit from object"
-rw-r--r--dovetail/cli/commands/cli_testcase.py2
-rw-r--r--dovetail/container.py2
-rw-r--r--dovetail/parser.py2
-rw-r--r--dovetail/report.py20
-rw-r--r--dovetail/testcase.py2
-rw-r--r--dovetail/utils/dovetail_config.py2
-rw-r--r--dovetail/utils/dovetail_logger.py2
7 files changed, 16 insertions, 16 deletions
diff --git a/dovetail/cli/commands/cli_testcase.py b/dovetail/cli/commands/cli_testcase.py
index b1c38fd5..a498d495 100644
--- a/dovetail/cli/commands/cli_testcase.py
+++ b/dovetail/cli/commands/cli_testcase.py
@@ -17,7 +17,7 @@ from dovetail.utils.dovetail_config import DovetailConfig as dt_cfg
from dovetail.testcase import Testsuite
-class CliTestcase:
+class CliTestcase(object):
@classmethod
def testsuite_load(cls):
diff --git a/dovetail/container.py b/dovetail/container.py
index b46ae880..3c2c2944 100644
--- a/dovetail/container.py
+++ b/dovetail/container.py
@@ -14,7 +14,7 @@ import utils.dovetail_utils as dt_utils
from utils.dovetail_config import DovetailConfig as dt_cfg
-class Container:
+class Container(object):
container_list = {}
has_pull_latest_image = {'yardstick': False, 'functest': False}
diff --git a/dovetail/parser.py b/dovetail/parser.py
index 95130cd9..fdde4f9e 100644
--- a/dovetail/parser.py
+++ b/dovetail/parser.py
@@ -15,7 +15,7 @@ import utils.dovetail_utils as dt_utils
from utils.dovetail_config import DovetailConfig as dt_cfg
-class Parser:
+class Parser(object):
"""preprocess configuration files"""
logger = None
diff --git a/dovetail/report.py b/dovetail/report.py
index 6145ad89..b7b27930 100644
--- a/dovetail/report.py
+++ b/dovetail/report.py
@@ -30,7 +30,7 @@ def get_pass_str(passed):
return 'FAIL'
-class Report:
+class Report(object):
results = {'functest': {}, 'yardstick': {}, 'shell': {}}
@@ -190,7 +190,7 @@ class Report:
return result
-class FunctestCrawler:
+class FunctestCrawler(object):
logger = None
@@ -280,7 +280,7 @@ class FunctestCrawler:
return None
-class YardstickCrawler:
+class YardstickCrawler(object):
logger = None
@@ -322,7 +322,7 @@ class YardstickCrawler:
return None
-class ShellCrawler:
+class ShellCrawler(object):
def __init__(self):
self.type = 'shell'
@@ -343,7 +343,7 @@ class ShellCrawler:
return None
-class CrawlerFactory:
+class CrawlerFactory(object):
CRAWLER_MAP = {'functest': FunctestCrawler,
'yardstick': YardstickCrawler,
@@ -357,14 +357,14 @@ class CrawlerFactory:
return None
-class ResultChecker:
+class ResultChecker(object):
@staticmethod
def check():
return 'PASS'
-class FunctestChecker:
+class FunctestChecker(object):
logger = None
@@ -406,7 +406,7 @@ class FunctestChecker:
testcase.passed(all_passed)
-class YardstickChecker:
+class YardstickChecker(object):
logger = None
@@ -424,7 +424,7 @@ class YardstickChecker:
return
-class ShellChecker:
+class ShellChecker(object):
@staticmethod
def check(testcase, result):
@@ -434,7 +434,7 @@ class ShellChecker:
testcase.passed(False)
-class CheckerFactory:
+class CheckerFactory(object):
CHECKER_MAP = {'functest': FunctestChecker,
'yardstick': YardstickChecker,
diff --git a/dovetail/testcase.py b/dovetail/testcase.py
index 9b6b1d7d..4ad2b361 100644
--- a/dovetail/testcase.py
+++ b/dovetail/testcase.py
@@ -259,7 +259,7 @@ class TestcaseFactory(object):
return None
-class Testsuite:
+class Testsuite(object):
logger = None
diff --git a/dovetail/utils/dovetail_config.py b/dovetail/utils/dovetail_config.py
index 7d2c1645..1efb4d8f 100644
--- a/dovetail/utils/dovetail_config.py
+++ b/dovetail/utils/dovetail_config.py
@@ -12,7 +12,7 @@ import os
import re
-class DovetailConfig:
+class DovetailConfig(object):
dovetail_config = {}
diff --git a/dovetail/utils/dovetail_logger.py b/dovetail/utils/dovetail_logger.py
index 0fe4103c..feb7aeff 100644
--- a/dovetail/utils/dovetail_logger.py
+++ b/dovetail/utils/dovetail_logger.py
@@ -28,7 +28,7 @@ import sys
from dovetail_config import DovetailConfig as dt_cfg
-class Logger:
+class Logger(object):
def __init__(self, logger_name):
DEBUG = os.getenv('DEBUG')