Merge pull request #46 from OwnCA/fix_lint_tests

Fix lint and tests

Author: kairoaraujo

Makefile

@@ -4,7 +4,7 @@ init:
 	pipenv install --dev
 
 all-tests:
-	tox -r
+	tox -re all_tests,pep8
 	coverage xml -i
 	coverage html -i
 
@@ -22,10 +22,6 @@ py38-tests:
 integration-tests:
 	tox -re integrations
 
-all-tests:
-	tox -re all_tests
-	coverage xml -i
-	coverage html -i
 
 publish-test:
 	pip install 'twine>=1.5.0'

ownca/ownca.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
-Copyright (c) 2018-2020 Kairo de Araujo
+Copyright (c) 2018-2021 Kairo de Araujo
 """
 
 from cryptography import x509
@@ -1138,7 +1138,9 @@ def sign_csr(self, csr, csr_public_key, maximum_days=825):
         csr_bytes = csr.public_bytes(
             encoding=serialization.Encoding.PEM
         )
-        host_cert_dir = os.path.join(self.ca_storage, CA_CERTS_DIR, common_name)
+        host_cert_dir = os.path.join(
+            self.ca_storage, CA_CERTS_DIR, common_name
+        )
 
         certificate = ca_sign_csr(
             self.cert, self.key, csr, csr_public_key,

ownca/utils.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
-Copyright (c) 2018-2020 Kairo de Araujo
+Copyright (c) 2018-2021 Kairo de Araujo
 """
 
 from glob import glob
-import inspect
 import os
 import re
 
@@ -92,7 +91,8 @@ def ownca_directory(ca_storage):
     """
     if "CA_test".lower() in ca_storage.lower() and not os.getenv("TEST_MODE"):
         raise ValueError(
-            f"Not allowed {ca_storage}. Please do not use a name that contains 'ca_test'"
+            f"Not allowed {ca_storage}. Please do not use a name that "
+            + "contains 'ca_test'"
         )
 
     ownca_status = {

tests/integrations/test_ca.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2020 Kairo de Araujo
+# Copyright 2020,2021 Kairo de Araujo
 #
 
 from cryptography import x509
@@ -181,7 +181,6 @@ def test_ica():
             "certificate file in CA Storage"
         ) in err.value
 
-
     assert isinstance(ca.key, rsa.RSAPrivateKeyWithSerialization)
     assert type(ca.public_key_bytes) == bytes
     assert ca.public_key_bytes.startswith(b"ssh-rsa")
@@ -261,4 +260,4 @@ def test_ca_sign_ica():
     assert ca.type == "Certificate Authority"
     assert ica.type == "Intermediate Certificate Authority"
     assert ica.cert.subject.rfc4514_string() == 'CN=ica.dev.ownca.org'
-    assert ica.cert.issuer.rfc4514_string() == 'CN=ownca.org'
+    assert ica.cert.issuer.rfc4514_string() == 'CN=ownca.org'