From 1dee6c618d879c20bf0a70eebc54bc8caf47716f Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue, 28 Apr 2020 00:45:08 +0100
Subject: [PATCH] Update test.json schema to add stdout

Update the test.json schema, adding the 'stdout' property.

Also amend the test.json schema so the presence of an unexpected
property on the root object causes a validation error.

v2:
Also add 'tools' property to json schema.
Amend the documentation not to use the word 'list' to describe a dict.
---
 data/test.schema.json         | 25 +++++++++++++++++++++++++
 docs/markdown/Contributing.md |  6 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/data/test.schema.json b/data/test.schema.json
index 72f160fd2..d3b80d06b 100644
--- a/data/test.schema.json
+++ b/data/test.schema.json
@@ -1,5 +1,6 @@
 {
   "type": "object",
+  "additionalProperties": false,
   "properties": {
     "env": {
       "type": "object",
@@ -100,6 +101,30 @@
           "prefix"
         ]
       }
+    },
+    "tools": {
+      "type": "object"
+    },
+    "stdout": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "line": {
+            "type": "string"
+          },
+          "match": {
+            "type": "string",
+            "enum": [
+              "literal",
+              "re"
+            ]
+          }
+        },
+        "required": [
+          "line"
+        ]
+      }
     }
   }
 }
diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md
index 34cd8cae2..b16f61542 100644
--- a/docs/markdown/Contributing.md
+++ b/docs/markdown/Contributing.md
@@ -329,10 +329,10 @@ Currently supported values are:
 
 #### tools
 
-This section specifies a list of tool requirements in a simple key-value format.
+This section specifies a dict of tool requirements in a simple key-value format.
 If a tool is specified, it has to be present in the environment, and the version
-requirement must be fulfilled match. Otherwise, the entire test is skipped
-(including every element in the test matrix).
+requirement must be fulfilled. Otherwise, the entire test is skipped (including
+every element in the test matrix).
 
 #### stdout