Disallow "METHOD: url" in defaults

Otherwise it becomes difficult to manage on a few dimensions:

* the code to do it is complex
* the readability of the test is damaged

So now the default dict is validated. If it has uppercase keys a
GabbiFormatError is raised. A non-gabbi test for this has been
added, along with a test for duplicate METHOD keys in one test.
The existing method_shortcut.yaml tests have been updated to reflect
the change in defaults.

Some further cleanups on the tests are probably required and docs are
still missing, but this is almost working.

gabbi/driver.py

@@ -153,7 +153,7 @@ def test_suite_from_yaml(loader, test_base_name, test_yaml, test_directory,
     # Set defaults from BASE_TESTS then update those defaults
     # with any defaults set in the YAML file.
     base_test_data = copy.deepcopy(case.HTTPTestCase.base_test)
-    defaults = test_yaml.get('defaults', {})
+    defaults = _validate_defaults(test_yaml.get('defaults', {}))
     test_update(base_test_data, defaults)
 
     # Establish any fixture classes.
@@ -178,6 +178,12 @@ def test_suite_from_yaml(loader, test_base_name, test_yaml, test_directory,
                 raise GabbiFormatError(
                     'malformed test chunk "%s": %s' % (test_datum, exc))
 
+        if not test['name']:
+            raise GabbiFormatError('Test name missing in a test in %s.'
+                                   % test_base_name)
+        test_name = '%s_%s' % (test_base_name,
+                               test['name'].lower().replace(' ', '_'))
+
         # use uppercase keys as HTTP method
         method_key = None
         for key, val in six.iteritems(test):
@@ -185,7 +191,7 @@ def test_suite_from_yaml(loader, test_base_name, test_yaml, test_directory,
                 if method_key:
                     raise GabbiFormatError(
                         'duplicate method/URL directive in "%s"' %
-                        test_base_name)
+                        test_name)
 
                 test['method'] = key
                 test['url'] = val
@@ -193,12 +199,6 @@ def test_suite_from_yaml(loader, test_base_name, test_yaml, test_directory,
         if method_key:
             del test[method_key]
 
-        if not test['name']:
-            raise GabbiFormatError('Test name missing in a test in %s.'
-                                   % test_base_name)
-        test_name = '%s_%s' % (test_base_name,
-                               test['name'].lower().replace(' ', '_'))
-
         if not test['url']:
             raise GabbiFormatError('Test url missing in test %s.'
                                    % test_name)
@@ -231,3 +231,10 @@ def test_suite_from_yaml(loader, test_base_name, test_yaml, test_directory,
         prior_test = this_test
 
     return file_suite
+
+
+def _validate_defaults(default_dict):
+    if [key for key in default_dict if key.isupper()]:
+        raise GabbiFormatError(
+            '"METHOD: url" pairs not allowed in defaults')
+    return default_dict

gabbi/gabbits_intercept/method_shortcut.yaml

@@ -1,8 +1,7 @@
-defaults:
-    POST: /somewhere
 
 tests:
-- name: defaults check
+- name: simple POST
+  POST: /somewhere
   data:
       cow: barn
   request_headers:
@@ -10,8 +9,8 @@ tests:
   response_json_paths:
       $.cow: barn
 
-- name: altered defaults
+- name: POST with query
-  url: /somewhere?chicken=coop
+  POST: /somewhere?chicken=coop
   data:
       cow: barn
   request_headers:
@@ -20,7 +19,7 @@ tests:
       $.cow: barn
       $.chicken[0]: coop
 
-- name: overridden defaults
+- name: simple GET
   GET: /
   ssl: True
   response_headers:
@@ -34,7 +33,10 @@ tests:
       x-gabbi-method: IMAGINARY
       x-gabbi-url: $SCHEME://$NETLOC/
 
-- name: duplicate shortcut
+# Can't do this because format validation is during test generation not
-  GET: /
+# test running. xfail only works during test running :(
-  POST: /
+# See gabbi/tests/test_driver for a test of this.
-  xfail: true
+# - name: duplicate shortcut
+#   GET: /
+#   POST: /
+#   xfail: true

gabbi/tests/test_driver.py

@@ -111,3 +111,25 @@ class DriverTest(unittest.TestCase):
                                         'localhost', 80, None, None)
         self.assertIn("Invalid test keys used in test foo_simple:",
                       str(failure.exception))
+
+    def test_method_url_pair_format_error(self):
+        test_yaml = {'defaults': {'GET': '/foo'}, 'tests': []}
+        with self.assertRaises(driver.GabbiFormatError) as failure:
+            driver.test_suite_from_yaml(self.loader, 'foo', test_yaml, '.',
+                                        'localhost', 80, None, None)
+        self.assertIn('"METHOD: url" pairs not allowed in defaults',
+                      str(failure.exception))
+
+    def test_method_url_pair_duplication_format_error(self):
+        test_yaml = {'tests': [{
+            'GET': '/',
+            'POST': '/',
+            'name': 'duplicate methods',
+        }]}
+        with self.assertRaises(driver.GabbiFormatError) as failure:
+            driver.test_suite_from_yaml(self.loader, 'foo', test_yaml, '.',
+                                        'localhost', 80, None, None)
+        self.assertIn(
+            'duplicate method/URL directive in "foo_duplicate_methods"',
+            str(failure.exception)
+        )