From 10974b5ad90de370fc082db4b74a099d524e82d9 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Tue, 31 Dec 2019 19:18:47 +0800
Subject: [PATCH] fix: json schema validation for testcase v2

---
 httprunner/loader/buildup.py |  2 +-
 httprunner/loader/check.py   | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/httprunner/loader/buildup.py b/httprunner/loader/buildup.py
index 085f3462..65d0042c 100644
--- a/httprunner/loader/buildup.py
+++ b/httprunner/loader/buildup.py
@@ -281,7 +281,6 @@ def load_testsuite(raw_testsuite):
             }
 
     """
-    JsonSchemaChecker.validate_testsuite_format(raw_testsuite)
     raw_testcases = raw_testsuite.pop("testcases")
     raw_testsuite["testcases"] = {}
 
@@ -293,6 +292,7 @@ def load_testsuite(raw_testsuite):
             raw_testsuite["testcases"][name] = raw_testcase
 
     elif isinstance(raw_testcases, list):
+        JsonSchemaChecker.validate_testsuite_v2_format(raw_testsuite)
         # format version 2, implemented in 2.2.0
         for raw_testcase in raw_testcases:
             __extend_with_testcase_ref(raw_testcase)
diff --git a/httprunner/loader/check.py b/httprunner/loader/check.py
index 853d1d59..0f01a4fc 100644
--- a/httprunner/loader/check.py
+++ b/httprunner/loader/check.py
@@ -39,16 +39,6 @@ class JsonSchemaChecker(object):
 
         return True
 
-    @staticmethod
-    def validate_testsuite_format(content):
-        try:
-            jsonschema.validate(content, testsuite_schema_v2, resolver=resolver)
-        except jsonschema.exceptions.ValidationError as ex:
-            logger.log_error(str(ex))
-            raise exceptions.FileFormatError
-
-        return True
-
     @staticmethod
     def validate_testcase_v1_format(content):
         """ check testcase format v1 if valid
@@ -67,6 +57,18 @@ class JsonSchemaChecker(object):
 
         return True
 
+    @staticmethod
+    def validate_testsuite_v2_format(content):
+        """ check testsuite format v2 if valid
+        """
+        try:
+            jsonschema.validate(content, testsuite_schema_v2, resolver=resolver)
+        except jsonschema.exceptions.ValidationError as ex:
+            logger.log_error(str(ex))
+            raise exceptions.FileFormatError
+
+        return True
+
 
 def is_testcase(data_structure):
     """ check if data_structure is a testcase.