Merge lp:~roadmr/canonical-identity-provider/find-cert-path-with-filename-everywhere into lp:canonical-identity-provider/release

[Daniel Manrique]

Consistently use find_cert_path's auto-append-filename capabilities

Consistently use find_cert_path's auto-append-filename capabilities.
Results in a net savings of *2* lines of code :)

[Maximiliano Bertacchini (maxiberta)]

+1!

review: Approve

=== modified file 'src/ubuntu_sso_saml/tests/test_models.py'
--- src/ubuntu_sso_saml/tests/test_models.py	2017-12-05 17:00:54 +0000
+++ src/ubuntu_sso_saml/tests/test_models.py	2018-01-09 19:46:14 +0000
@@ -83,8 +83,7 @@
             ["'certificate' must be a PEM-formatted X.509 certificate."])
 
     def test_validate_cert_valid(self):
-        path = find_cert_path()
-        cert_filename = path + 'certificate.pem'
+        cert_filename = find_cert_path('certificate.pem')
         with open(cert_filename) as cert_file:
             cert_data = cert_file.read()
         try:
 
=== modified file 'src/ubuntu_sso_saml/tests/test_views.py'
--- src/ubuntu_sso_saml/tests/test_views.py	2018-01-09 19:46:14 +0000
+++ src/ubuntu_sso_saml/tests/test_views.py	2018-01-09 19:46:14 +0000
@@ -19,9 +19,8 @@
         new_saml2idp_config = copy.deepcopy(saml2idp_metadata.SAML2IDP_CONFIG)
         self.patch(saml2idp_metadata, 'SAML2IDP_CONFIG',
                    new=new_saml2idp_config)
-        path = find_cert_path()
-        cert_file = path + 'certificate.pem'
-        priv_file = path + 'private-key.pem'
+        cert_file = find_cert_path('certificate.pem')
+        priv_file = find_cert_path('private-key.pem')
         test_config = {
             'certificate_file': cert_file,
             'private_key_file': priv_file,