Merge lp:~joetalbott/utah/dashboard_integration into lp:utah

[Joe Talbott]

These are some fairly minor changes to work towards QA Dashboard integration.

[Max Brustkern (nuclearbob)]

Looks reasonable to me.

review: Approve

[lp:~joetalbott/utah/dashboard_integration]

735. By Joe Talbott on 2012-11-07

client.common - Show times in a parsable format.

736. By Joe Talbott on 2012-11-07

publish - Add tools for processing client results to the dashboard.

TODO:
  * need to get the token from a secure config file.
  * need to hook into run_utah_tests.py.

=== modified file 'utah/client/common.py'
--- utah/client/common.py	2012-10-26 11:01:06 +0000
+++ utah/client/common.py	2012-11-07 18:10:29 +0000
@@ -365,6 +365,20 @@
     return arch
 
 
+def get_arch():
+    """
+    The host's architecture.
+    
+    Returns the human readable architecture or 'unknown'.
+    """
+    arches = {
+        'x86_64': 'amd64',
+        'x86': 'i386',
+        'i686': 'i386',
+    }
+
+    return arches.get(platform.machine(), 'unknown')
+
 def get_release():
     """
     The host's release name (i.e. precise, quantal, etc.)

=== modified file 'utah/client/result.py'
--- utah/client/result.py	2012-10-25 11:08:31 +0000
+++ utah/client/result.py	2012-11-07 18:10:29 +0000
@@ -5,6 +5,8 @@
 from .common import (
         get_host_info,
         get_build_number,
+        get_release,
+        get_arch,
         )
 
 
@@ -180,6 +182,11 @@
                 'uname': list(host_info['uname']),
                 'media-info': host_info['media-info'],
                 'install_type': self.install_type,
+                'build_number': get_build_number(),
+                'release': get_release(),
+                'ran_at': self.results[0]['start_time'],
+                'arch': get_arch(),
+                'name': self.name,
         }
 
         if self.publish is not None:

=== modified file 'utah/client/runner.py'
--- utah/client/runner.py	2012-10-25 20:46:36 +0000
+++ utah/client/runner.py	2012-11-07 18:10:29 +0000
@@ -102,22 +102,8 @@
                 'type': 'string',
                 'enum': ['smoke', 'kernel-sru', 'bootspeed', 'upgrade'],
                 },
-            "publish": {
-                'type': 'object',
-                'properties': {
-                    "url": {
-                        "type": "string",
-                        "required": True,
-                        },
-                    "token": {
-                        "type": "string",
-                        "required": True,
-                        },
-                    "name": {
-                        "type": "string",
-                        "required": True,
-                        },
-                    },
+            "name": {
+                'type': 'string',
                 },
             "testsuites": {
                 # must be a list to accept a schema rather than a simple type
@@ -189,6 +175,7 @@
         self.process_master_runlist(resume=resume)
         self.result.runlist = self.master_runlist
         self.result.install_type = self.install_type
+        self.result.name = self.name
 
     def backup_rc_local(self):
         """
@@ -379,6 +366,11 @@
         if 'timeout' in data:
             self.timeout = int(data['timeout'])
 
+        if 'name' in data:
+            self.name = data['name']
+        else:
+            self.name = 'unnamed'
+
         # Add publish metatdata to the result object
         if 'publish' in data:
             self.result.publish = data['publish']

=== modified file 'utah/client/tests/test_jsonschema.py'
--- utah/client/tests/test_jsonschema.py	2012-10-10 14:44:00 +0000
+++ utah/client/tests/test_jsonschema.py	2012-11-07 18:10:29 +0000
@@ -6,26 +6,6 @@
 
 from utah.client.runner import Runner
 
-yaml_content_publish = """---
-timeout: 80
-publish:
-    url: http://dashboard.local/api/add_result
-    token: testtoken
-    name: precise-server-amd64
-testsuites:
-    - name: testsuite1
-      fetch_method: bzr
-      fetch_location: lp:utah
-    - name: testsuite2
-      fetch_method: bzr
-      fetch_location: lp:utah
-"""
-
-yaml_content_publish_bad = [
-        re.sub('\n\s+url: .*', '', yaml_content_publish),
-        re.sub('\n\s+token: .*', '', yaml_content_publish),
-        re.sub('\n\s+name: .*', '', yaml_content_publish),
-        ]
 
 yaml_content = """---
 - name: testsuite1
@@ -116,15 +96,6 @@
             jsonschema.validate(data, Runner.MASTER_RUNLIST_SCHEMA)
             fp.close()
 
-    def test_publish_schema(self):
-        """
-        Test that the publish piece of the schema works correctly.
-        """
-
-        data = yaml.load(yaml_content_publish)
-        print("data: {}".format(data))
-        jsonschema.validate(data, Runner.MASTER_RUNLIST_SCHEMA)
-
     def test_include_schema(self):
         """
         Test that include works correctly.
@@ -134,19 +105,6 @@
         print("data: {}".format(data))
         jsonschema.validate(data, Runner.MASTER_RUNLIST_SCHEMA)
 
-    def test_publish_bad_schema(self):
-        """
-        Test that the publish piece of the schema fails if any of
-        the required field are missing.
-        """
-
-        for content in yaml_content_publish_bad:
-            data = yaml.load(content)
-            print("data: {}".format(data))
-            self.assertRaises(jsonschema.ValidationError,
-                              jsonschema.validate,
-                              data, Runner.MASTER_RUNLIST_SCHEMA)
-
     def test_bad_schemas(self):
         """
         Test that required fields are enforced by the schema.

=== modified file 'utah/client/tests/test_result.py'
--- utah/client/tests/test_result.py	2012-08-08 12:58:52 +0000
+++ utah/client/tests/test_result.py	2012-11-07 18:10:29 +0000
@@ -16,14 +16,16 @@
             'command': 'echo hi',
             'returncode': 0,
             'stdout': 'hi',
-            'stderr': ''
+            'stderr': '',
+            'start_time': '20121107 12:00:00',
         }
 
         self.result_fail = {
             'command': 'echo failure',
             'returncode': 2,
             'stdout': 'hi',
-            'stderr': ''
+            'stderr': '',
+            'start_time': '20121107 12:00:00',
         }
 
     def test_add_result(self):