Merge remote branch 'cros/upstream' into tempbranch3

frontend/tko/rpc_interface_unittest.py

Index: frontend/tko/rpc_interface_unittest.py
diff --git a/frontend/tko/rpc_interface_unittest.py b/frontend/tko/rpc_interface_unittest.py
index 91be76e0c1f2c3a2b1be81097e7677feb607c83b..6649a637f31d37dcf1a162984057edbed3d316b2 100644
--- a/frontend/tko/rpc_interface_unittest.py
+++ b/frontend/tko/rpc_interface_unittest.py
@@ -173,6 +173,8 @@ class TkoTestMixin(object):
                                                 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
@@ -249,6 +251,7 @@ class RpcInterfaceTest(unittest.TestCase, TkoTestMixin):
                                                 '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):