Merge remote branch 'cros/upstream' into tempbranch3

frontend/tko/rpc_interface_unittest.py

 #!/usr/bin/python
 
 import re, unittest
 import common
 from autotest_lib.frontend import setup_django_environment
 from autotest_lib.frontend import setup_test_environment
 from autotest_lib.client.common_lib.test_utils import mock
 from django.db import connection
 from autotest_lib.frontend.tko import models, rpc_interface
 
@@ skipping 155 matching lines @@
         self.first_test = job1_test1
         job1_test2 = models.Test.objects.create(job=job1, test='mytest2',
                                                 kernel=kernel1,
                                                 status=failed_status,
                                                 machine=machine)
         job2_test1 = models.Test.objects.create(job=job2, test='kernbench',
                                                 kernel=kernel2,
                                                 status=good_status,
                                                 machine=machine)
 
+        job1.jobkeyval_set.create(key='keyval_key', value='keyval_value')
+
         # create test attributes, test labels, and iterations
         # like Noah's Ark, include two of each...just in case there's a bug with
         # multiple related items
         models.TestAttribute.objects.create(test=job1_test1, attribute='myattr',
                                             value='myval')
         models.TestAttribute.objects.create(test=job1_test1,
                                             attribute='myattr2', value='myval2')
 
         self._add_iteration_keyval('tko_iteration_attributes', test=job1_test1,
                                    iteration=1, attribute='iattr',
@@ skipping 56 matching lines @@
         self.assertEquals(test['attributes'], {'myattr': 'myval',
                                                'myattr2': 'myval2'})
         self.assertEquals(test['iterations'], [{'attr': {'iattr': 'ival',
                                                          'iattr2': 'ival2'},
                                                 'perf': {'iresult': 1,
                                                          'iresult2': 2}},
                                                {'attr': {},
                                                 'perf': {'iresult': 3,
                                                          'iresult2': 4}}])
         self.assertEquals(test['labels'], ['testlabel1', 'testlabel2'])
+        self.assertEquals(test['job_keyvals'], {'keyval_key': 'keyval_value'})
 
 
     def test_test_attributes(self):
         rpc_interface.set_test_attribute('foo', 'bar', test_name='mytest1')
         test = rpc_interface.get_detailed_test_views()[0]
         self.assertEquals(test['attributes'], {'foo': 'bar',
                                                'myattr': 'myval',
                                                'myattr2': 'myval2'})
 
         rpc_interface.set_test_attribute('foo', 'goo', test_name='mytest1')
@@ skipping 336 matching lines @@
                  'machine_label_hyphen-label',
                  'iteration_result_hyphen-result'],
                 test_attribute_fields=['hyphen-attr'],
                 test_label_fields=['hyphen-label'],
                 machine_label_fields=['hyphen-label'],
                 iteration_result_fields=['hyphen-result'])
 
 
 if __name__ == '__main__':
     unittest.main()