Browse Source

PEP 8 update_type

Zane Kansil 10 years ago
parent
commit
c92d60ded9
1 changed files with 35 additions and 39 deletions
  1. 35 39
      toolset/benchmark/test_types/update_type.py

+ 35 - 39
toolset/benchmark/test_types/update_type.py

@@ -3,44 +3,40 @@ from benchmark.test_types.query_type import QueryTestType
 
 
 from pprint import pprint
 from pprint import pprint
 
 
-class UpdateTestType(QueryTestType):
-
-  def __init__(self):
-    kwargs = {
-      'name': 'update',
-      'accept_header': self.accept_json,
-      'requires_db': True,
-      'args': ['update_url']
-    }
-    FrameworkTestType.__init__(self, **kwargs)
-
-  def get_url(self):
-    return self.update_url
-
-  def verify(self, base_url):
-    '''Validates the response is a JSON array of 
-    the proper length, each JSON Object in the array 
-    has keys 'id' and 'randomNumber', and these keys 
-    map to integers. Case insensitive and 
-    quoting style is ignored
-    '''
-
-    url = base_url + self.update_url
-    cases = [
-      ('2',   'fail'),
-      ('0',   'warn'),
-      ('foo', 'warn'),
-      ('501', 'warn'),
-      ('',    'warn')
-    ]
-    problems = self._verifyQueryCases(url, cases)
-
-    if len(problems) == 0:
-      return [('pass','',url + '2'),
-              ('pass','',url + '0'),
-              ('pass','',url + 'foo'),
-              ('pass','',url + '501')]
-    else:
-      return problems
 
 
+class UpdateTestType(QueryTestType):
 
 
+    def __init__(self):
+        kwargs = {
+            'name': 'update',
+            'accept_header': self.accept_json,
+            'requires_db': True,
+            'args': ['update_url']
+        }
+        FrameworkTestType.__init__(self, **kwargs)
+
+    def get_url(self):
+        return self.update_url
+
+    def verify(self, base_url):
+        '''Validates the response is a JSON array of 
+        the proper length, each JSON Object in the array 
+        has keys 'id' and 'randomNumber', and these keys 
+        map to integers. Case insensitive and 
+        quoting style is ignored
+        '''
+
+        url = base_url + self.update_url
+        cases = [
+            ('2',   'fail'),
+            ('0',   'warn'),
+            ('foo', 'warn'),
+            ('501', 'warn'),
+            ('',    'warn')
+        ]
+        problems = self._verifyQueryCases(url, cases)
+
+        if len(problems) == 0:
+            return [('pass', '', url + case) for (case, _) in cases]
+        else:
+            return problems