Imported Debian patch 4.0.5-6~numeezy
This commit is contained in:
committed by
Mario Fetka
parent
c44de33144
commit
10dfc9587b
@@ -23,25 +23,23 @@ import copy
|
||||
from ipatests.test_integration import config
|
||||
from ipapython.ipautil import write_tmp_file
|
||||
from ipatests.util import assert_deepequal
|
||||
from ipalib.constants import MAX_DOMAIN_LEVEL
|
||||
|
||||
DEFAULT_OUTPUT_DICT = {
|
||||
"nis_domain": "ipatest",
|
||||
"test_dir": "/root/ipatests",
|
||||
"debug": False,
|
||||
"ad_admin_name": "Administrator",
|
||||
"ipv6": False,
|
||||
"ssh_key_filename": "~/.ssh/id_rsa",
|
||||
"ssh_username": "root",
|
||||
"root_ssh_key_filename": "~/.ssh/id_rsa",
|
||||
"admin_name": "admin",
|
||||
"ad_admin_password": "Secret123",
|
||||
"ssh_password": None,
|
||||
"root_password": None,
|
||||
"dns_forwarder": "8.8.8.8",
|
||||
"domains": [],
|
||||
"dirman_dn": "cn=Directory Manager",
|
||||
"dirman_password": "Secret123",
|
||||
"ntp_server": "ntp.clock.test",
|
||||
"admin_password": "Secret123",
|
||||
"domain_level": MAX_DOMAIN_LEVEL
|
||||
"admin_password": "Secret123"
|
||||
}
|
||||
|
||||
DEFAULT_OUTPUT_ENV = {
|
||||
@@ -59,7 +57,6 @@ DEFAULT_OUTPUT_ENV = {
|
||||
"ADADMINPW": "Secret123",
|
||||
"IPv6SETUP": "",
|
||||
"IPADEBUG": "",
|
||||
"DOMAINLVL": str(MAX_DOMAIN_LEVEL),
|
||||
}
|
||||
|
||||
DEFAULT_INPUT_ENV = {
|
||||
@@ -132,12 +129,6 @@ class CheckConfig(object):
|
||||
assert_deepequal(self.get_output_dict(), conf.to_dict())
|
||||
self.check_config(conf)
|
||||
|
||||
# Settings to override:
|
||||
extra_input_dict = {}
|
||||
extra_input_env = {}
|
||||
extra_output_dict = {}
|
||||
extra_output_env = {}
|
||||
|
||||
|
||||
class TestEmptyConfig(CheckConfig):
|
||||
extra_input_dict = {}
|
||||
|
||||
Reference in New Issue
Block a user