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

[Javier Collado]

This branch updates the test suite schema to make it possible to override
values in "tslist.run" adding them directly at the same level as "tests"
instead of inside "overrides".

I've looked in the merge request that caused this problem trying to find if
some code was removed to use the values found this way as override values, but
I haven't found any.

Then, I've looked into the code to make sure this is correctly handled, but I
haven't found any place in which this happens.

Then, I've run `utah/client/tests/test_testsuite.py:TestTestSuite.test_run`
with an updated `utah/client/examples/examples/tslist.run` and, unless there's
some configuration problem on my side, it looks like the override value isn't
really being used at all.

This makes me feel uneasy because it seems that this schema update is good with
regard to not breaking run list validation for old test suites, but it's
deceptive because, if my test results are correct, there isn't any code that
supports what is being requested in the runlist.

[Javier Collado (javier.collado)]

I'm rejecting this request because the target branch isn't the right one.

review: Disapprove

[Andy Doan (doanac)]

wait - we still need this in our trunk as well, right?

[Javier Collado (javier.collado)]

Yes, you're right. Since I see you merged the changes into lp:~utah/utah/0.12 I assume these changes are fine for lp:utah

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-08 13:03:45 +0000
+++ debian/changelog	2013-05-08 17:09:43 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 utah (0.13ubuntu1) UNRELEASED; urgency=low
 
   [ Javier Collado ]
@@ -9,6 +10,14 @@
 
  -- Javier Collado <[e-mail]>  Tue, 07 May 2013 16:06:48 +0200
 
+=======
+utah (0.12.1ubuntu1) UNRELEASED; urgency=low
+
+  * Allow overrides at test level in test suite runlist (LP: #1177787)
+
+ -- Javier Collado <[e-mail]>  Wed, 08 May 2013 18:06:29 +0200
+
+>>>>>>> MERGE-SOURCE
 utah (0.12ubuntu1) quantal; urgency=low
 
   [ Dmitrijs Ledkovs ]

=== modified file 'utah/client/tests/test_testsuite.py'
--- utah/client/tests/test_testsuite.py	2013-05-01 20:51:33 +0000
+++ utah/client/tests/test_testsuite.py	2013-05-08 17:09:43 +0000
@@ -214,6 +214,16 @@
                   'unknown-property': 'value',
                   }])
 
+    def test_all_overrides_at_test_level(self):
+        """Verify that all overrides at the same level as test are valid."""
+        self.validate(
+            [{'test': 'test name',
+              'timeout': 1,
+              'build_cmd': '<command>',
+              'command': '<command>',
+              'run_as': '<user>',
+              }])
+
     def test_empty_overrides_invalid(self):
         """Verify an empty overrides section is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
@@ -240,6 +250,18 @@
             self.validate([{'test': 'test name',
                             'overrides': {'timeout': -1}}])
 
+    def test_all_overrides(self):
+        """Verify all properties in the overrides section are valid."""
+        self.validate(
+            [{'test': 'test name',
+              'overrides': {
+                  'timeout': 1,
+                  'build_cmd': '<command>',
+                  'command': '<command>',
+                  'run_as': '<user>',
+              },
+              }])
+
     def test_list_valid(self):
         """Verify a list of test cases is valid."""
         self.validate(

=== modified file 'utah/client/testsuite.py'
--- utah/client/testsuite.py	2013-04-25 16:01:31 +0000
+++ utah/client/testsuite.py	2013-05-08 17:09:43 +0000
@@ -71,9 +71,14 @@
         'items': {
             'type': 'object',
             'properties': {
-                'test': {
-                    'type': 'string',
+                'test': {'type': 'string'},
+                'timeout': {
+                    'type': 'integer',
+                    'minimum': 1,
                 },
+                'build_cmd': {'type': 'string'},
+                'command': {'type': 'string'},
+                'run_as': {'type': 'string'},
                 'overrides': {
                     'type': 'object',
                     'properties': {