Browse Source

All types inherit directly from FrameworkTestType

Zane Kansil 10 years ago
parent
commit
7de808cba1

+ 5 - 1
toolset/benchmark/test_types/json_type.py

@@ -1,5 +1,9 @@
 from benchmark.test_types.framework_test_type import FrameworkTestType
-from benchmark.test_types.verifications import basic_body_verification, verify_headers, verify_helloworld_object
+from benchmark.test_types.verifications import (
+    basic_body_verification,
+    verify_headers,
+    verify_helloworld_object
+)
 
 import json
 

+ 7 - 9
toolset/benchmark/test_types/query_type.py

@@ -1,17 +1,15 @@
 from benchmark.test_types.framework_test_type import FrameworkTestType
-from benchmark.test_types.db_type import DBTestType
-from benchmark.test_types.verifications import verify_headers, verify_randomnumber_list, verify_query_cases
+from benchmark.test_types.verifications import (
+    verify_headers,
+    verify_randomnumber_list,
+    verify_query_cases
+)
 
-import json
 
+import json
 
-class QueryTestType(DBTestType):
 
-    '''
-    This test type is used for the multiple queries test
-    Inherits from DBTestType
-    Both tests deal with the same objects; this test just expects a list of them
-    '''
+class QueryTestType(FrameworkTestType):
 
     def __init__(self):
         kwargs = {

+ 1 - 4
toolset/benchmark/test_types/update_type.py

@@ -1,11 +1,8 @@
 from benchmark.test_types.framework_test_type import FrameworkTestType
-from benchmark.test_types.query_type import QueryTestType
 from benchmark.test_types.verifications import verify_query_cases
 
-from pprint import pprint
 
-
-class UpdateTestType(QueryTestType):
+class UpdateTestType(FrameworkTestType):
 
     def __init__(self):
         kwargs = {