Merge lp:~javier.collado/utah/bug1178185 into lp:~utah/utah/0.12

[Javier Collado]

This branch updates the schema to allow zero timeout values and let the files
that use it validate.

[Andy Doan (doanac)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-08 22:24:02 +0000
+++ debian/changelog	2013-05-09 10:04:28 +0000
@@ -1,3 +1,9 @@
+utah (0.12.2ubuntu1) UNRELEASED; urgency=low
+
+  * Updated schema to allow zero timeout values (LP: #1178185)
+
+ -- Javier Collado <[e-mail]>  Thu, 09 May 2013 12:02:19 +0200
+
 utah (0.12.1ubuntu1) raring; urgency=low
 
   * Allow overrides at test level in test suite runlist (LP: #1177787)

=== modified file 'utah/client/runner.py'
--- utah/client/runner.py	2013-05-01 17:37:58 +0000
+++ utah/client/runner.py	2013-05-09 10:04:28 +0000
@@ -93,7 +93,7 @@
             },
             'timeout': {
                 'type': 'integer',
-                'minimum': 1,
+                'minimum': 0,
             },
             'repeat_count': {
                 'type': 'integer',

=== modified file 'utah/client/testcase.py'
--- utah/client/testcase.py	2013-04-29 21:04:46 +0000
+++ utah/client/testcase.py	2013-05-09 10:04:28 +0000
@@ -67,7 +67,7 @@
             },
             'timeout': {
                 'type': 'integer',
-                'minimum': 1,
+                'minimum': 0,
             },
             'build_cmd': {'type': 'string'},
             'command': {'type': 'string'},

=== modified file 'utah/client/tests/test_runner.py'
--- utah/client/tests/test_runner.py	2013-05-01 17:37:58 +0000
+++ utah/client/tests/test_runner.py	2013-05-09 10:04:28 +0000
@@ -380,18 +380,6 @@
             'battery_measurements': True,
         })
 
-    def test_zero_timeout_invalid(self):
-        """A zero timeout is invalid"""
-        with self.assertRaises(jsonschema.ValidationError):
-            self.validate({
-                'testsuites': [{
-                    'name': 'name',
-                    'fetch_method': 'dev',
-                    'fetch_location': 'fetch location',
-                }],
-                'timeout': 0,
-            })
-
     def test_negative_timeout_invalid(self):
         """A negative timeout is invalid"""
         with self.assertRaises(jsonschema.ValidationError):

=== modified file 'utah/client/tests/test_testcase.py'
--- utah/client/tests/test_testcase.py	2013-04-29 21:04:46 +0000
+++ utah/client/tests/test_testcase.py	2013-05-09 10:04:28 +0000
@@ -229,32 +229,6 @@
                 'run_as': 'run_as',
             })
 
-    def test_zero_timeout_invalid(self):
-        """A zero timeout is invalid"""
-        with self.assertRaises(jsonschema.ValidationError):
-            self.validate({
-                'description': 'description',
-                'dependencies': 'dependencies',
-                'action': 'action',
-                'expected_results': 'expected_results',
-                'command': 'command',
-                'run_as': 'run_as',
-                'timeout': 0,
-            })
-
-    def test_negative_timeout_invalid(self):
-        """A negative timeout is invalid"""
-        with self.assertRaises(jsonschema.ValidationError):
-            self.validate({
-                'description': 'description',
-                'dependencies': 'dependencies',
-                'action': 'action',
-                'expected_results': 'expected_results',
-                'command': 'command',
-                'run_as': 'run_as',
-                'timeout': -1
-            })
-
     def test_type_userland_valid(self):
         """Userland type is valid."""
         self.validate({

=== modified file 'utah/client/tests/test_testsuite.py'
--- utah/client/tests/test_testsuite.py	2013-05-08 16:01:00 +0000
+++ utah/client/tests/test_testsuite.py	2013-05-09 10:04:28 +0000
@@ -230,12 +230,6 @@
                   'overrides': {'unknown-property': 'value'}
                   }])
 
-    def test_zero_timeout_invalid(self):
-        """A zero timeout is invalid"""
-        with self.assertRaises(jsonschema.ValidationError):
-            self.validate([{'test': 'test name',
-                            'overrides': {'timeout': 0}}])
-
     def test_negative_timeout_invalid(self):
         """A negative timeout is invalid"""
         with self.assertRaises(jsonschema.ValidationError):
@@ -296,11 +290,6 @@
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({'unknown-property': 'value'})
 
-    def test_zero_timeout_invalid(self):
-        """A zero timeout is invalid."""
-        with self.assertRaises(jsonschema.ValidationError):
-            self.validate({'timeout': 0})
-
     def test_negative_timeout_invalid(self):
         """A negative timeout is invalid."""
         with self.assertRaises(jsonschema.ValidationError):

=== modified file 'utah/client/testsuite.py'
--- utah/client/testsuite.py	2013-05-08 16:01:00 +0000
+++ utah/client/testsuite.py	2013-05-09 10:04:28 +0000
@@ -74,7 +74,7 @@
                 'test': {'type': 'string'},
                 'timeout': {
                     'type': 'integer',
-                    'minimum': 1,
+                    'minimum': 0,
                 },
                 'build_cmd': {'type': 'string'},
                 'command': {'type': 'string'},
@@ -84,7 +84,7 @@
                     'properties': {
                         'timeout': {
                             'type': 'integer',
-                            'minimum': 1,
+                            'minimum': 0,
                         },
                         'build_cmd': {'type': 'string'},
                         'command': {'type': 'string'},
@@ -105,7 +105,7 @@
         'properties': {
             'timeout': {
                 'type': 'integer',
-                'minimum': 1,
+                'minimum': 0,
             },
             'build_cmd': {'type': 'string'},
             'ts_setup': {'type': 'string'},