From 5a1661475fe4fba7ae18408c799de0f69cb1b9d2 Mon Sep 17 00:00:00 2001
From: Thore Husfeldt <thore.husfeldt@gmail.com>
Date: Tue, 5 Mar 2024 09:50:15 +0100
Subject: [PATCH] Make YAML files in doc/, problems/ conform

---
 doc/generators.yaml                           |  5 +----
 .../generators/generators.yaml                |  4 ++--
 .../identity/generators/generators.yaml       | 21 +++----------------
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/doc/generators.yaml b/doc/generators.yaml
index 4813dfde9..81e77c011 100644
--- a/doc/generators.yaml
+++ b/doc/generators.yaml
@@ -176,10 +176,7 @@ data:
       hard_cases_group:
         # Directories may contain a testdata.yaml that will be written as specified.
         testdata.yaml:
-          on_reject: break
-          accept_score: "25"
-          range: 0 25
-          grader_flags: min
+          output_validator_flags: space_change_sensitive
 
         # To enable automatic numbering of testcases, data: may also contain a list of
         # single-element dictionaries instead of a single dictionary. In this case,
diff --git a/test/problems/generatorincludes/generators/generators.yaml b/test/problems/generatorincludes/generators/generators.yaml
index 292c89dfd..67d1519a3 100644
--- a/test/problems/generatorincludes/generators/generators.yaml
+++ b/test/problems/generatorincludes/generators/generators.yaml
@@ -11,8 +11,8 @@ data:
     data:
       - small:
           testdata.yaml:
-            input_validator_flags: --small
-            input_validators:
+            output_validator_flags: space_change_sensitive
+            input_validator_flags:
               connected: --small
               strongly-connected: --small
           data:
diff --git a/test/problems/identity/generators/generators.yaml b/test/problems/identity/generators/generators.yaml
index 6b28a996d..8ff98f527 100644
--- a/test/problems/identity/generators/generators.yaml
+++ b/test/problems/identity/generators/generators.yaml
@@ -4,13 +4,13 @@ solution: /submissions/accepted/author.py
 random_salt: "abc"
 
 generators:
-  main.py:
+  main_py:
     - main.py
     - lib.py
-  main.cpp:
+  main_cpp:
     - main.cpp
     - lib.h
-  main.c:
+  main_c:
     - main.c
     - lib.h
 
@@ -68,21 +68,11 @@ data:
         data:
           stdoutpy: stdout.py 200
           stdoutcpp: stdout.cpp 201
-<<<<<<< HEAD
-          # {name} should always just be `testcase` now.
-          inans_old: write_in_and_ans_old.py {name} 212
-          inans: write_in_and_ans.py 202
-          hintdesc: hint_desc.py 203
-          main.py: main.py 204
-          main.c: main.c 205
-          main.cpp: main.cpp 206
-=======
           inans: write_in_and_ans.py 202
           hintdesc: hint_desc.py 203
           main_py: main_py 204
           main_c: main_c 205
           main_cpp: main_cpp 206
->>>>>>> 14aa7d1 (identity: ensure valid YAML)
       numbered_group:
         data:
           - dir: dir 300
@@ -105,8 +95,6 @@ data:
           - "": stdout.py 131
           - "": stdout.py 132 # 10.in
       seeding:
-        testdata.yaml:
-          arbitrary_key: some_value
         solution: /submissions/accepted/author.cpp
         random_salt: "def"
         data:
@@ -177,8 +165,6 @@ data:
       non_empty_group_6:
         data:
           - "": stdout.py 503
-      has_type:
-        type: directory
       json:
         {
           data:
@@ -188,6 +174,5 @@ data:
               { "": stdout.py 602 },
             ],
         }
-    unknown_key:
 
 unknown_key: