Renaming 'tests' to 'runs' in the schema (#30)

kernelci · Nov 4, 2021 · 11c9b35 · 11c9b35
1 parent 30d145e
commit 11c9b35
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/kcidb_io/schema/test_v3.py b/kcidb_io/schema/test_v3.py
@@ -30,7 +30,7 @@ def test_origin(self):
                 dict(revision_id="origin1:5e29d1443c46b6ca70a4c940a67e8c09f05dcb7e",
                      id="origin3:2"),
             ],
-            tests=[
+            runs=[
                 dict(build_id="origin2:1", id="origin4:1-1"),
                 dict(build_id="origin2:1", id="origin5:1-2"),
                 dict(build_id="origin3:2", id="origin6:2-1"),
@@ -52,7 +52,7 @@ def test_origin(self):
                      id="origin3:2",
                      origin="origin3"),
             ],
-            tests=[
+            runs=[
                 dict(build_id="origin2:1", id="origin4:1-1", origin="origin4"),
                 dict(build_id="origin2:1", id="origin5:1-2", origin="origin5"),
                 dict(build_id="origin3:2", id="origin6:2-1", origin="origin6"),

diff --git a/kcidb_io/schema/test_v4.py b/kcidb_io/schema/test_v4.py
@@ -39,7 +39,7 @@ def test_upgrade(self):
                      id="origin2:2",
                      origin="origin2"),
             ],
-            tests=[
+            runs=[
                 dict(build_id="origin1:1", id="origin4:1-1", origin="origin4"),
                 dict(build_id="origin1:1", id="origin5:1-2", origin="origin5"),
                 dict(build_id="origin2:2", id="origin6:2-1", origin="origin6"),
@@ -72,7 +72,7 @@ def test_upgrade(self):
                      id="origin2:2",
                      origin="origin2"),
             ],
-            tests=[
+            runs=[
                 dict(build_id="origin1:1", id="origin4:1-1", origin="origin4"),
                 dict(build_id="origin1:1", id="origin5:1-2", origin="origin5"),
                 dict(build_id="origin2:2", id="origin6:2-1", origin="origin6"),
@@ -238,7 +238,7 @@ def test_description_to_comment_rename(self):
                      id="origin3:2",
                      origin="origin3"),
             ],
-            tests=[
+            runs=[
                 dict(build_id="origin2:1", id="origin4:1-1", origin="origin4",
                      description="A test with a comment"),
                 dict(build_id="origin2:1", id="origin5:1-2", origin="origin5"),
@@ -270,7 +270,7 @@ def test_description_to_comment_rename(self):
                      id="origin3:2",
                      origin="origin3"),
             ],
-            tests=[
+            runs=[
                 dict(build_id="origin2:1", id="origin4:1-1", origin="origin4",
                      comment="A test with a comment"),
                 dict(build_id="origin2:1", id="origin5:1-2", origin="origin5"),

diff --git a/kcidb_io/schema/v1.py b/kcidb_io/schema/v1.py
@@ -329,8 +329,8 @@
         },
 
         # A test run on a build
-        "test": {
-            "title": "test",
+        "run": {
+            "title": "test run",
             "description":
                 "A test run against a build.\n"
                 "\n"
@@ -545,10 +545,10 @@
             "type": "array",
             "items": {"$ref": "#/$defs/build"},
         },
-        "tests": {
+        "runs": {
             "description": "List of test runs",
             "type": "array",
-            "items": {"$ref": "#/$defs/test"},
+            "items": {"$ref": "#/$defs/run"},
         },
     },
     "additionalProperties": False,
@@ -594,7 +594,7 @@ def get_version(data):
     "": ["revisions"],
     "revisions": ["builds"],
     "builds": ["tests"],
-    "tests": []
+    "runs": []
 }
 
 VERSION = Version(JSON_VERSION_MAJOR, JSON_VERSION_MINOR, JSON, TREE,

diff --git a/kcidb_io/schema/v2.py b/kcidb_io/schema/v2.py
@@ -330,8 +330,8 @@
         },
 
         # A test run on a build
-        "test": {
-            "title": "test",
+        "run": {
+            "title": "test run",
             "description":
                 "A test run against a build.\n"
                 "\n"
@@ -516,10 +516,10 @@
             "type": "array",
             "items": {"$ref": "#/$defs/build"},
         },
-        "tests": {
+        "runs": {
             "description": "List of test runs",
             "type": "array",
-            "items": {"$ref": "#/$defs/test"}
+            "items": {"$ref": "#/$defs/run"}
         },
     },
     "additionalProperties": False,

diff --git a/kcidb_io/schema/v3.py b/kcidb_io/schema/v3.py
@@ -401,8 +401,8 @@
         },
 
         # A test run on a build
-        "test": {
-            "title": "test",
+        "run": {
+            "title": "test run",
             "description":
                 "A test run against a build.\n"
                 "\n"
@@ -602,10 +602,10 @@
             "type": "array",
             "items": {"$ref": "#/$defs/build"},
         },
-        "tests": {
+        "runs": {
             "description": "List of test runs",
             "type": "array",
-            "items": {"$ref": "#/$defs/test"},
+            "items": {"$ref": "#/$defs/run"},
         },
     },
     "additionalProperties": False,

diff --git a/kcidb_io/schema/v4.py b/kcidb_io/schema/v4.py
@@ -444,8 +444,8 @@
         },
 
         # A test run on a build
-        "test": {
-            "title": "test",
+        "run": {
+            "title": "test run",
             "description":
                 "A test run against a build.\n"
                 "\n"
@@ -670,10 +670,10 @@
             "type": "array",
             "items": {"$ref": "#/$defs/build"},
         },
-        "tests": {
+        "runs": {
             "description": "List of test runs",
             "type": "array",
-            "items": {"$ref": "#/$defs/test"},
+            "items": {"$ref": "#/$defs/run"},
         },
     },
     "additionalProperties": False,
@@ -735,7 +735,7 @@ def inherit(data):
             build['comment'] = build.pop('description')
 
     # Inherit tests
-    for test in data.get('tests', []):
+    for test in data.get('runs', []):
         # Rename 'description' to 'comment'
         if 'description' in test:
             test['comment'] = test.pop('description')
@@ -757,7 +757,7 @@ def inherit(data):
     "": ["checkouts"],
     "checkouts": ["builds"],
     "builds": ["tests"],
-    "tests": []
+    "runs": []
 }
 
 VERSION = Version(JSON_VERSION_MAJOR, JSON_VERSION_MINOR, JSON,