URL: https://github.com/freeipa/freeipa/pull/6061
Author: wladich
Title: #6061: ipatests: use AD domain name from config instead of hardcoded
value
Action: opened
PR body:
"""
The test fails when test config contains AD domain value other than one
hardcoded in the test code.
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/6061/head:pr6061
git checkout pr6061
From d28ecd7606144184ae859a8609e480ec8b52d507 Mon Sep 17 00:00:00 2001
From: Sergey Orlov <sor...@redhat.com>
Date: Mon, 25 Oct 2021 16:13:15 +0200
Subject: [PATCH 1/2] ipatests: use AD domain name from config instead of
hardcoded value
The test fails when test config contains AD domain value other than one
hardcoded in the test code.
---
ipatests/test_integration/test_trust.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ipatests/test_integration/test_trust.py b/ipatests/test_integration/test_trust.py
index a58e27af0c4..7f44f3e6e0b 100644
--- a/ipatests/test_integration/test_trust.py
+++ b/ipatests/test_integration/test_trust.py
@@ -944,12 +944,12 @@ def test_server_option_with_unreachable_ad(self):
['chown', '--reference', paths.NAMED_CONF, ad_zone_file])
named_conf = self.master.get_file_contents(paths.NAMED_CONF,
encoding='utf-8')
- named_conf += textwrap.dedent('''
- zone "ad.test" {{
+ named_conf += textwrap.dedent(f'''
+ zone "{self.ad.domain.name}" {{
type master;
- file "{}";
+ file "{ad_zone_file}";
}};
- '''.format(ad_zone_file))
+ '''
self.master.put_file_contents(paths.NAMED_CONF, named_conf)
tasks.restart_named(self.master)
try:
From af7b8d4d3fbf5f39c4a257d4679cdc15d3c6f2b3 Mon Sep 17 00:00:00 2001
From: Sergey Orlov <sor...@redhat.com>
Date: Mon, 25 Oct 2021 16:13:57 +0200
Subject: [PATCH 2/2] temp commit
---
.freeipa-pr-ci.yaml | 2 +-
ipatests/prci_definitions/temp_commit.yaml | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml
index abcf8c5b634..80656690080 120000
--- a/.freeipa-pr-ci.yaml
+++ b/.freeipa-pr-ci.yaml
@@ -1 +1 @@
-ipatests/prci_definitions/gating.yaml
\ No newline at end of file
+ipatests/prci_definitions/temp_commit.yaml
\ No newline at end of file
diff --git a/ipatests/prci_definitions/temp_commit.yaml b/ipatests/prci_definitions/temp_commit.yaml
index 4b0398b9218..ef10cd4b5f0 100644
--- a/ipatests/prci_definitions/temp_commit.yaml
+++ b/ipatests/prci_definitions/temp_commit.yaml
@@ -61,14 +61,14 @@ jobs:
timeout: 1800
topology: *build
- fedora-latest/temp_commit:
+ fedora-latest/test_trust:
requires: [fedora-latest/build]
priority: 50
job:
- class: RunPytest
+ class: RunADTests
args:
build_url: '{fedora-latest/build_url}'
- test_suite: test_integration/test_REPLACEME.py
+ test_suite: test_integration/test_trust.py
template: *ci-master-latest
- timeout: 3600
- topology: *master_1repl_1client
+ timeout: 9000
+ topology: *adroot_adchild_adtree_master_1client
_______________________________________________
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://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure
