Revize fbfc4b04

Re #8705 - Reformatting, test updates (discussed invalid branch returns 400).

tests/integration_tests/rest_api/certificates_test.py

@@ -42 +42 @@
         usage = ["SSL", "authentication", "digitalSignature"]
 
     return server.post("/api/certificates", content_type="application/json", json={
-    "CA": parent,
-    "subject": {
-        "C": "CZ",
-        "CN": title,
-        "L": "Pilsen",
-        "O": title,
-        "OU": "IT department",
-        "ST": "Pilsen Region",
-        "emailAddress": "[e-mail]"
-    },
-    "usage": usage,
-    "validityDays": 30
+        "CA": parent,
+        "subject": {
+            "C": "CZ",
+            "CN": title,
+            "L": "Pilsen",
+            "O": title,
+            "OU": "IT department",
+            "ST": "Pilsen Region",
+            "emailAddress": "[e-mail]"
+        },
+        "usage": usage,
+        "validityDays": 30
     })
 
 
@@ -703 +703 @@
 
 
 def test_certificate_deletion(server):
-
     # custom tree for checking node bijection w/ the actual certificate tree
     all_certs = {}
     parent_of = {}
@@ -788 +787 @@
 
             # twice, just in case
             ret = server.get(f"/api/certificates/{cert_id}")
-            assert ret.status_code == 205   # TODO change to 404 after someone gets the issue assigned and resolves it
+            assert ret.status_code == 205  # TODO change to 404 after someone gets the issue assigned and resolves it
             json = ret.json
             assert "data" in json
             assert "success" in json
@@ -910 +909 @@
     assert ret.json["success"]
     assert ret.json["data"]["status"] == "expired"
 
+
 def test_create_with_key_with_pass_valid(server, cryptography_service):
     key_pass = "123456Seven"
     key_pem = cryptography_service.create_private_key(key_pass)
@@ -933 +933 @@
     ret = server.post("/api/certificates", content_type="application/json", json=certificate)
     assert ret.status_code == 201
 
+
 def test_create_with_key_with_pass_invalid_1(server, cryptography_service):
     key_pass = "123456Seven"
     key_pem = cryptography_service.create_private_key(key_pass)
@@ -958 +959 @@
     assert ret.json["data"] == 'The provided passphrase does not match the provided key.'
     assert not ret.json["success"]
 
+
 def test_create_with_key_with_pass_invalid_2(server, cryptography_service):
     key_pass = "123456Seven"
 
@@ -982 +984 @@
     assert ret.json["data"] == 'The provided passphrase does not match the provided key.'
     assert not ret.json["success"]
 
+
 def test_create_with_key_no_pass(server, cryptography_service):
     key_pem = cryptography_service.create_private_key()
 
     certificate = {
-        "CA": 1,
         "subject": {
             "C": "CZ",
             "CN": "Rare Name",
@@ -1003 +1005 @@
     ret = server.post("/api/certificates", content_type="application/json", json=certificate)
     assert ret.status_code == 201
 
+
 def test_create_with_key_no_pass_invalid_1(server, cryptography_service):
     certificate = {
-        "CA": 1,
         "subject": {
             "C": "CZ",
             "CN": "Rare Name",
@@ -1023 +1025 @@
     assert ret.status_code == 400
     assert not ret.json["success"]
 
+
 def test_create_no_key_with_pass(server, cryptography_service):
     key_pass = "123456Seven"
 
@@ -1051 +1054 @@
     key_pem = ret.json["data"]
     assert cryptography_service.verify_key(key_pem, key_pass)
 
+
 def test_create_no_key_with_pass_invalid_1(server, cryptography_service):
     key_pass = "123456Seven"
 
@@ -1079 +1083 @@
     key_pem = ret.json["data"]
     assert not cryptography_service.verify_key(key_pem, "iforgotthepassagainimsorryfrowningface")
 
+
 def test_create_no_key_no_pass_invalid(server, cryptography_service):
     certificate = {
         "CA": 1,
@@ -1095 +1100 @@
         }
     }
     ret = server.post("/api/certificates", content_type="application/json", json=certificate)
-    assert ret.status_code == 201
+    assert ret.status_code == 400