Merge "attach version number to url in testAPI"
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 26 May 2016 06:39:07 +0000 (06:39 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 26 May 2016 06:39:07 +0000 (06:39 +0000)
1  2 
utils/test/result_collection_api/resources/handlers.py
utils/test/result_collection_api/tests/unit/test_result.py

@@@ -73,10 -73,10 +73,10 @@@ class GenericApiHandler(RequestHandler)
          return CreateResponse(href=href).format()
  
  
- class VersionHandler(RequestHandler):
+ class VersionHandler(GenericApiHandler):
      """ Display a message for the API version """
      def get(self):
-         self.write("Collection of test result API, v1")
+         self.finish_request([{'v1': 'basics'}])
  
  
  class PodHandler(GenericApiHandler):
@@@ -620,6 -620,9 +620,6 @@@ class TestResultsHandler(GenericApiHand
                              "Could not find testcase [{}] "
                              .format(result.case_name))
  
 -        # convert payload to object
 -        result.creation_date = datetime.now()
 -
          _id = yield self.db.results.insert(result.format(), check_keys=False)
  
          self.finish_request(self._create_response(_id))
@@@ -47,10 -47,8 +47,10 @@@ class TestResultBase(TestBase)
          self.version = 'C'
          self.build_tag = 'v3.0'
          self.scenario = 'odl-l2'
 -        self.criteria = '10s'
 +        self.criteria = 'passed'
          self.trust_indicator = 0.7
 +        self.start_date = "2016-05-23 07:16:09.477097"
 +        self.stop_date = "2016-05-23 07:16:19.477097"
          super(TestResultBase, self).setUp()
          self.details = Details(timestart='0', duration='9s', status='OK')
          self.req_d = ResultCreateRequest(pod_name=self.pod,
@@@ -58,8 -56,7 +58,8 @@@
                                           case_name=self.case,
                                           installer=self.installer,
                                           version=self.version,
 -                                         description='vping use ssh',
 +                                         start_date=self.start_date,
 +                                         stop_date=self.stop_date,
                                           details=self.details.format(),
                                           build_tag=self.build_tag,
                                           scenario=self.scenario,
                                           trust_indicator=self.trust_indicator)
          self.get_res = TestResult
          self.list_res = TestResults
-         self.basePath = '/results'
+         self.basePath = '/api/v1/results'
          self.req_pod = PodCreateRequest(self.pod, 'metal', 'zte pod 1')
          self.req_project = ProjectCreateRequest(self.project, 'vping test')
          self.req_testcase = TestcaseCreateRequest('/cases/vping',
                                                    self.case,
                                                    'vping-ssh test')
-         self.create_help('/pods', self.req_pod)
-         self.create_help('/projects', self.req_project)
-         self.create_help('/projects/%s/cases', self.req_testcase, self.project)
+         self.create_help('/api/v1/pods', self.req_pod)
+         self.create_help('/api/v1/projects', self.req_project)
+         self.create_help('/api/v1/projects/%s/cases',
+                          self.req_testcase,
+                          self.project)
  
      def assert_res(self, code, result):
          self.assertEqual(code, HTTP_OK)
@@@ -85,6 -84,7 +87,6 @@@
          self.assertEqual(result.case_name, req.case_name)
          self.assertEqual(result.installer, req.installer)
          self.assertEqual(result.version, req.version)
 -        self.assertEqual(result.description, req.description)
          details_req = Details.from_dict(req.details)
          details_res = Details.from_dict(result.details)
          self.assertEqual(details_res.duration, details_req.duration)
@@@ -94,8 -94,7 +96,8 @@@
          self.assertEqual(result.scenario, req.scenario)
          self.assertEqual(result.criteria, req.criteria)
          self.assertEqual(result.trust_indicator, req.trust_indicator)
 -        self.assertIsNotNone(result.creation_date)
 +        self.assertIsNotNone(result.start_date)
 +        self.assertIsNotNone(result.stop_date)
          self.assertIsNotNone(result._id)