Merge lp:~javier.collado/utah/bug1178238 into lp:utah

[Javier Collado]

This branch makes sure that the overrides are applied regardless of where they
are defined.

The changes in this branch should be merged against 0.12 as well, but I think
it's better not to do it to avoid regressions that might be caused by the
change in the behavior with regard to overrides.

[Andy Doan (doanac)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-08 22:38:01 +0000
+++ debian/changelog	2013-05-09 12:27:26 +0000
@@ -7,6 +7,7 @@
   * Set reboot default to 'never' in tc_control schema (LP: #1175809)
   * Apply retry strategy to install UTAH client package (LP: #1175732)
   * Added phoenix manpage (LP: #1067704)
+  * Apply all overrides in tslist.run to the test cases (LP: #1178238)
 
  -- Javier Collado <[e-mail]>  Tue, 07 May 2013 16:06:48 +0200
 

=== modified file 'utah/client/tests/test_testsuite.py'
--- utah/client/tests/test_testsuite.py	2013-05-08 22:25:45 +0000
+++ utah/client/tests/test_testsuite.py	2013-05-09 12:27:26 +0000
@@ -21,6 +21,8 @@
 
 import jsonschema
 
+from mock import Mock, patch
+
 from utah.client import testsuite
 from utah.client.common import (
     debug_print,
@@ -161,6 +163,47 @@
         self.assertEqual(case.name, included_test_name)
         self.assertNotEqual(case.name, excluded_test_name)
 
+    @patch('utah.client.testsuite.TestCase')
+    @patch('utah.client.testsuite.os')
+    def test_runlist_overrides(self, suite_os, testcase):
+        """Verify overrides when they are in their own section."""
+        overrides = {'timeout': 1,
+                     'build_cmd': '<build_cmd>',
+                     'command': '<command>',
+                     'run_as': '<username>'}
+        suite_os.path.exists.return_value = True
+        suite_control_data = {}
+        suite_runlist_data = [
+            {'test': 'test_case_name',
+             'overrides': overrides,
+             }
+        ]
+        suite = testsuite.TestSuite(
+            name='testsuite_name', path='test_path', result=Mock(),
+            _control_data=suite_control_data,
+            _runlist_data=suite_runlist_data)
+        case = suite.tests[0]
+        case.process_overrides.assert_called_with(overrides)
+
+    @patch('utah.client.testsuite.TestCase')
+    @patch('utah.client.testsuite.os')
+    def test_overrides_at_test_level(self, suite_os, testcase):
+        """Verify overrides when they are in mixed with the test case name."""
+        overrides = {'timeout': 1,
+                     'build_cmd': '<build_cmd>',
+                     'command': '<command>',
+                     'run_as': '<username>'}
+        suite_os.path.exists.return_value = True
+        suite_control_data = {}
+        suite_runlist_data = [{'test': 'test_case_name'}]
+        suite_runlist_data[0].update(overrides)
+        suite = testsuite.TestSuite(
+            name='testsuite_name', path='test_path', result=Mock(),
+            _control_data=suite_control_data,
+            _runlist_data=suite_runlist_data)
+        case = suite.tests[0]
+        case.process_overrides.assert_called_with(overrides)
+
 
 class TestTestSuiteRunlistSchema(unittest.TestCase):
 

=== modified file 'utah/client/testsuite.py'
--- utah/client/testsuite.py	2013-05-08 16:01:00 +0000
+++ utah/client/testsuite.py	2013-05-09 12:27:26 +0000
@@ -211,11 +211,21 @@
                           battery_measurements=self.battery_measurements,
                           _save_state_callback=self.save_state_callback,
                           _reboot_callback=self.reboot_callback)
+
+            runlist_properties = self.RUNLIST_SCHEMA['items']['properties']
+            override_properties = \
+                runlist_properties['overrides']['properties'].keys()
+            overrides = {}
+            for property_name in override_properties:
+                if property_name in test:
+                    overrides[property_name] = test[property_name]
             if 'overrides' in test:
                 if self.timeout is not None:
                     test['overrides']['timeout'] = self.timeout
+                overrides.update(test['overrides'])
 
-                tc.process_overrides(test['overrides'])
+            if overrides:
+                tc.process_overrides(overrides)
 
             self.tests.append(tc)