Revize e9b4e2a1

Empty country code is now considered as a valid country code when creating a new certificate.

Changed tests accordingly.

src/services/certificate_service.py

@@ -56 +56 @@
         :param subject: A subject to be verified
         :raises InvalidCertificateAttribute: When a subject with an invalid attribute is passed
         """
-        if subject.country is not None and len(subject.country) != 2:
+        if subject.country is not None and subject.country != "" and len(subject.country) != 2:
             raise InvalidSubjectAttribute("Country code", "Must consist of exactly 2 letters")
 
     # TODO usages present in method parameters but not in class diagram

tests/integration_tests/rest_api/certificates_test.py

@@ -1302 +1302 @@
 @pytest.mark.parametrize(
     "cc",
     [
-        pytest.param(""),
         pytest.param("C"),
         pytest.param("CCZ"),
     ],
@@ -1323 +1322 @@
 @pytest.mark.parametrize(
     "cc",
     [
-        pytest.param(""),
         pytest.param("C"),
         pytest.param("CCZ"),
     ],
 )
-def test_invalid_subject_country_code(server, cc):
+def test_inter_ca_invalid_subject_country_code(server, cc):
     root_ret = make_root_ca(server)
     ret = make_inter_ca(server, root_ret.json["data"], "Foo", cc)
 

tests/integration_tests/services/certificate_service_test.py

@@ -517 +517 @@
     "cc",
     [
         pytest.param(None),
+        pytest.param(""),
         pytest.param("CZ")
     ],
 )
@@ -529 +530 @@
     "cc",
     [
         pytest.param(None),
+        pytest.param(""),
         pytest.param("CZ"),
     ],
 )
@@ -548 +550 @@
 @pytest.mark.parametrize(
     "cc",
     [
-        pytest.param(""),
         pytest.param("C"),
         pytest.param("CCZ"),
     ],
@@ -564 +565 @@
 @pytest.mark.parametrize(
     "cc",
     [
-        pytest.param(""),
         pytest.param("C"),
         pytest.param("CCZ"),
     ],

tests/unit_tests/services/certificate/check_subject_is_valid_test.py

@@ -15 +15 @@
 @pytest.mark.parametrize(
     "cc",
     [
-        pytest.param(""),
         pytest.param("C"),
         pytest.param("CCZ"),
     ],