URL: https://github.com/freeipa/freeipa/pull/1988
Author: amore17
 Title: #1988: Add test for  --external-cert-file points to a non-existing file 
or invalid file.
Action: opened

PR body:
"""
Reverts freeipa/freeipa#1978
"""

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/1988/head:pr1988
git checkout pr1988
From b511c9f0ec16984618f803f3940005433b29dc16 Mon Sep 17 00:00:00 2001
From: amore17 <38001338+amor...@users.noreply.github.com>
Date: Fri, 1 Jun 2018 14:46:39 +0000
Subject: [PATCH] Revert "Add test for --external-cert-file points to a
 non-existing file or invalid file."

This reverts commit 579984bfecb922c31632cc639f8b2d47839114c4.
---
 .freeipa-pr-ci.yaml                      | 173 ++++++++++++++++++++++++++++++-
 ipatests/test_integration/test_caless.py |  18 ----
 2 files changed, 171 insertions(+), 20 deletions(-)

diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml
index 08ff0a7464..21f1c004d7 100644
--- a/.freeipa-pr-ci.yaml
+++ b/.freeipa-pr-ci.yaml
@@ -27,6 +27,18 @@ jobs:
         timeout: 1800
         topology: *build
 
+  fedora-28/simple_replication:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_simple_replication.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl
+
   fedora-28/caless:
     requires: [fedora-28/build]
     priority: 50
@@ -34,7 +46,164 @@ jobs:
       class: RunPytest
       args:
         build_url: '{fedora-28/build_url}'
-        test_suite: test_integration/test_caless.py::TestReplicaInstall
+        test_suite: test_integration/test_caless.py::TestServerReplicaCALessToCAFull
         template: *ci-master-f28
-        timeout: 6600
+        timeout: 3600
         topology: *master_1repl
+
+  fedora-28/external_ca:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_external_ca.py::TestExternalCA test_integration/test_external_ca.py::TestSelfExternalSelf test_integration/test_external_ca.py::TestExternalCAInstall
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl_1client
+
+  fedora-28/test_topologies:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_topologies.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl
+
+  fedora-28/test_sudo:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_sudo.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl_1client
+
+  fedora-28/test_commands:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_commands.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl
+
+  fedora-28/test_kerberos_flags:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_kerberos_flags.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl_1client
+
+  fedora-28/test_http_kdc_proxy:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_http_kdc_proxy.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl_1client
+
+  fedora-28/test_forced_client_enrolment:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_forced_client_reenrollment.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl_1client
+
+  fedora-28/test_advise:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_advise.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl
+
+  fedora-28/test_testconfig:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_testconfig.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl
+
+  fedora-28/test_service_permissions:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_service_permissions.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl
+
+  fedora-28/test_netgroup:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_netgroup.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl
+
+  fedora-28/test_vault:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_vault.py
+        template: *ci-master-f28
+        timeout: 4500
+        topology: *master_1repl
+
+  fedora-28/test_authconfig:
+    requires: [fedora-28/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-28/build_url}'
+        test_suite: test_integration/test_authselect.py
+        template: *ci-master-f28
+        timeout: 3600
+        topology: *master_1repl_1client
+
diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py
index 86a5f0f82d..1666b1ce41 100644
--- a/ipatests/test_integration/test_caless.py
+++ b/ipatests/test_integration/test_caless.py
@@ -1181,24 +1181,6 @@ def test_no_ds_password(self):
         if self.domain_level > DOMAIN_LEVEL_0:
             self.verify_installation()
 
-    @replica_install_teardown
-    def test_install_ca_replica(self):
-        # related to https://pagure.io/freeipa/issue/6985
-        replica = self.replicas[0]
-
-        # install ca on replica with non-existing cert
-        tasks.install_ca(replica, external_ca=True, cert_files='abc.crt')
-
-        # install ca with invalid cert
-        contents = (
-            '-----BEGIN CERTIFICATE-----\n'
-            'sdnmsdkfbsdifbsdbasdsdSDDDasdmnd\n'
-            '-----END CERTIFICATE-----')
-
-        cert1 = tempfile.mkdtemp(suffix='abc.crt', dir=paths.TMP)
-        replica.put_file_contents(cert1, contents)
-        tasks.install_ca(replica, external_ca=True, cert_files=cert1)
-
 
 class TestClientInstall(CALessBase):
     num_clients = 1
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/freeipa-devel@lists.fedorahosted.org/message/6DQXHXY23ODXFJDG5GJ2KBMDNY23TD3S/

Reply via email to