Merge lp:~doanac/qa-dashboard/smoke-test-result-api into lp:qa-dashboard

[Andy Doan]

allow publishing of smoketestresults via REST API

Allow the client to include the UTAH YAML with its SmokeResult object
so that the SmokeTestResult details can also be populated

allow publishing of smoketestresults via REST API

Allow the client to include the UTAH YAML with its SmokeResult object
so that the SmokeTestResult details can also be populated

[Joe Talbott (joetalbott)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:713
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/297/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/297/rebuild

review: Approve (continuous-integration)

=== modified file 'smokeng/api.py'
--- smokeng/api.py	2013-12-14 21:56:19 +0000
+++ smokeng/api.py	2014-02-05 22:09:00 +0000
@@ -20,6 +20,7 @@
 from tastypie.resources import ModelResource, ALL, ALL_WITH_RELATIONS
 
 from common.models import JenkinsBuild, JenkinsJob
+from smokeng import utah_utils
 from smokeng.models import SmokeImage, SmokeResult
 
 
@@ -111,6 +112,32 @@
         authorization = WriteAuthorization()
         allowed_methods = ALLOWED_METHODS
 
+    def save(self, bundle, skip_errors=False):
+        test_results = bundle.data.get('results')
+        obj = bundle.obj
+        if test_results:
+            # setup passes, failures, etc
+            obj.pass_count = test_results.get('passes', 0)
+            obj.error_count = test_results.get('errors', 0)
+            obj.fail_count = test_results.get('failures', 0)
+            obj.total_count = obj.pass_count + obj.error_count + obj.fail_count
+        else:
+            if not bundle.data.get('pass_count'):
+                obj.pass_count = 0
+            if not bundle.data.get('error_count'):
+                obj.error_count = 0
+            if not bundle.data.get('fail_count'):
+                obj.fail_count = 0
+            if not bundle.data.get('total_count'):
+                obj.total_count = 0
+
+        r = super(SmokeResultResource, self).save(bundle, skip_errors)
+
+        if test_results:
+            details = []
+            test_results['result'] = obj
+            utah_utils._add_test_results(details, test_results)
+        return r
 
 v1_api = Api(api_name='v1')
 v1_api.register(JenkinsJobResource())
@@ -118,6 +145,7 @@
 v1_api.register(SmokeImageResource())
 v1_api.register(SmokeResultResource())
 
+
 # for tastypie, a hack to allow us to not require using TZ:
 # http://github.com/toastdriven/django-tastypie/pull/561#issuecomment-26204496
 def _now():

=== modified file 'smokeng/tests.py'
--- smokeng/tests.py	2013-12-12 05:37:09 +0000
+++ smokeng/tests.py	2014-02-05 22:09:00 +0000
@@ -18,6 +18,11 @@
 import mock
 import urllib2
 
+# this is required to pull in the tastypie hack at the bottom of
+# smokeng/api.py. Without this, our tests won't pass
+import smokeng.api
+smokeng.api  # just to silence pep8 warnings. this does nothing
+
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import Client
@@ -968,6 +973,49 @@
         self.assertEqual(params['jenkins_build'], obj['jenkins_build'])
         self.assertEqual(params['image'], obj['image'])
 
+    def testResultAddWithResults(self):
+        '''a smokeresult with utah results included'''
+        params = {
+            'ran_at': datetime.datetime.now().isoformat(),
+            'status': 0,
+            'results': {
+                'passes': 2,
+                'errors': 1,
+                'failures': 1,
+                'commands': [
+                    # include one smoketestresult to ensure it can be processed
+                    {
+                        'command': 'foo-cmd',
+                        'cmd_type': 'foo-type',
+                        'testcase': 'foo-testcase',
+                        'testsuite': 'foo-testsuite',
+                        'stdout': 'foo-stdout',
+                        'stderr': 'foo-stderr',
+                        'returncode': 0,
+                    },
+                ]
+            },
+            'jenkins_build': ('/smokeng/api/v1/build/%d/' %
+                              self.jenkins_build.id),
+            'image': '/smokeng/api/v1/image/%d/' % self.image.id,
+            'name': 'the-test-result-name',
+        }
+        loc = self._post('/smokeng/api/v1/result/', params)
+        obj = self._get(loc)
+        self.assertEqual(params['name'], obj['name'])
+        self.assertEqual(params['ran_at'], obj['ran_at'])
+        self.assertEqual(params['status'], obj['status'])
+        self.assertEqual(4, obj['total_count'])
+        self.assertEqual(2, obj['pass_count'])
+        self.assertEqual(1, obj['error_count'])
+        self.assertEqual(1, obj['fail_count'])
+        self.assertEqual(params['jenkins_build'], obj['jenkins_build'])
+        self.assertEqual(params['image'], obj['image'])
+
+        # make sure one SmokeTestResult from above was created
+        obj = SmokeResult.objects.get(pk=obj['id'])
+        self.assertEqual(1, len(obj.smoketestresult_set.values()))
+
     def _testResultState(self, state):
         resource = '/smokeng/api/v1/result/%d/' % self.result.id
         params = {