aboutsummaryrefslogtreecommitdiffstats
path: root/python/tidy/servo_tidy_tests
diff options
context:
space:
mode:
authorAneesh Agrawal <aneeshusa@gmail.com>2017-06-05 15:59:09 -0400
committerAneesh Agrawal <aneeshusa@gmail.com>2018-01-08 00:31:34 -0800
commitd0abd1cdfa54b4f8c31fa79e583e2c9f628e98e8 (patch)
treeaaf9dd1ef109905acde2f46fd19cae1dcd3c97c9 /python/tidy/servo_tidy_tests
parent753e2bc781ee3f9fd219b1f06ac332ec3077675c (diff)
downloadservo-d0abd1cdfa54b4f8c31fa79e583e2c9f628e98e8.tar.gz
servo-d0abd1cdfa54b4f8c31fa79e583e2c9f628e98e8.zip
Update buildbot_steps lint to handle env variables
https://github.com/servo/saltfs/pull/687 added support for specifying environment variables in `buildbot_steps.yml`. Update the servo-tidy buildbot_steps.yml linter to reflect this. Use the voluptuous Python library (BSD 3-clause license) for validation in lieu of a much larger hand-written implementation. Update the tidy self tests to take into account the new error messages.
Diffstat (limited to 'python/tidy/servo_tidy_tests')
-rw-r--r--python/tidy/servo_tidy_tests/test_tidy.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py
index dd4c06db4c0..432d5c1117e 100644
--- a/python/tidy/servo_tidy_tests/test_tidy.py
+++ b/python/tidy/servo_tidy_tests/test_tidy.py
@@ -210,12 +210,12 @@ class CheckTidiness(unittest.TestCase):
def test_non_list_mapped_buildbot_steps(self):
errors = tidy.collect_errors_for_files(iterFile('non_list_mapping_buildbot_steps.yml'), [tidy.check_yaml], [], print_text=False)
- self.assertEqual("Key 'non-list-key' maps to type 'str', but list expected", errors.next()[2])
+ self.assertEqual("expected a list for dictionary value @ data['non-list-key']", errors.next()[2])
self.assertNoMoreErrors(errors)
def test_non_string_list_mapping_buildbot_steps(self):
errors = tidy.collect_errors_for_files(iterFile('non_string_list_buildbot_steps.yml'), [tidy.check_yaml], [], print_text=False)
- self.assertEqual("List mapped to 'mapping_key' contains non-string element", errors.next()[2])
+ self.assertEqual("expected str @ data['mapping_key'][0]", errors.next()[2])
self.assertNoMoreErrors(errors)
def test_lock(self):