This is an automated email from the git hooks/post-receive script.
spichugi pushed a commit to branch master
in repository 389-ds-base.
commit 60553e83225a96f80e21395671f41065905ac311
Author: Amita Sharma <amsharma(a)redhat.com>
Date: Wed Aug 23 19:13:31 2017 +0530
Issue 47840: Add docstrings to setup tests
Description: Refactor the setup test suite docstrings.
Get instance data with generage_ds_params.
https://pagure.io/389-ds-base/issue/47840
Reviewed by: Simon Pichugin
Signed-off-by: Simon Pichugin <spichugi(a)redhat.com>
---
dirsrvtests/tests/suites/setup_ds/setup_ds_test.py | 51 ++++++++++++----------
1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/dirsrvtests/tests/suites/setup_ds/setup_ds_test.py
b/dirsrvtests/tests/suites/setup_ds/setup_ds_test.py
index 687af13..69866c1 100644
--- a/dirsrvtests/tests/suites/setup_ds/setup_ds_test.py
+++ b/dirsrvtests/tests/suites/setup_ds/setup_ds_test.py
@@ -1,11 +1,8 @@
-import os
-
import pytest
-from lib389.tasks import *
from lib389.utils import *
-from lib389._constants import (DEFAULT_SUFFIX, LOCALHOST, SER_HOST, SER_PORT,
- SER_SERVERID_PROP, SER_CREATION_SUFFIX,
SER_INST_SCRIPTS_ENABLED,
- PORT_STANDALONE, args_instance)
+from lib389._constants import (DEFAULT_SUFFIX, SER_HOST, SER_PORT,
+ SER_SERVERID_PROP, SER_CREATION_SUFFIX,
SER_INST_SCRIPTS_ENABLED,
+ args_instance, ReplicaRole)
from lib389 import DirSrv
@@ -21,13 +18,14 @@ def create_instance(config_attr):
log.info('create_instance - Installs the instance and Sets the value of
InstScriptsEnabled to true OR false.')
log.info("Set up the instance and set the config_attr")
+ instance_data = generate_ds_params(1, ReplicaRole.STANDALONE)
# Create instance
standalone = DirSrv(verbose=False)
# Args for the instance
- args_instance[SER_HOST] = LOCALHOST
- args_instance[SER_PORT] = PORT_STANDALONE
- args_instance[SER_SERVERID_PROP] = 'standalone'
+ args_instance[SER_HOST] = instance_data[SER_HOST]
+ args_instance[SER_PORT] = instance_data[SER_PORT]
+ args_instance[SER_SERVERID_PROP] = instance_data[SER_SERVERID_PROP]
args_instance[SER_CREATION_SUFFIX] = DEFAULT_SUFFIX
args_instance[SER_INST_SCRIPTS_ENABLED] = config_attr
args_standalone = args_instance.copy()
@@ -41,19 +39,23 @@ def create_instance(config_attr):
@pytest.mark.parametrize("config_attr", ('true', 'false'))
def test_slapd_InstScriptsEnabled(config_attr):
- """Try to set InstScriptsEnabled attribute
- to various config_attrs as default, true and false
-
- :ID: 02faac7f-c44d-4a3e-bf2d-1021e51da1ed
- :feature: Add configure option to disable instance specific scripts
- :setup: Create directory server instance using setup-ds.pl
- with slapd.InstScriptsEnabled option as "True" and
"False"
- :steps: 1. Execute setup-ds.pl with slapd.InstScriptsEnabled option as
"True" and "False" one by one
- 2. Check if /usr/lib64/dirsrv/slapd-instance instance script directory is
created or not.
- 3. The script directory should be created if slapd.InstScriptsEnabled option
is "True"
- 4. The script directory should not be created if slapd.InstScriptsEnabled
option is "False"
- :expectedresults: The script directory should be created
- if slapd.InstScriptsEnabled option is "True" and not if
it is "Fasle"
+ """Tests InstScriptsEnabled attribute with "True" and
"False" options
+
+ :id: 02faac7f-c44d-4a3e-bf2d-1021e51da1ed
+
+ :setup: Standalone instance with slapd.InstScriptsEnabled option as "True"
and "False"
+
+ :steps:
+ 1. Execute setup-ds.pl with slapd.InstScriptsEnabled option as
"True".
+ 2. Check if /usr/lib64/dirsrv/slapd-instance instance script directory is
created or not.
+ 3. Execute setup-ds.pl with slapd.InstScriptsEnabled option as
"False".
+ 4. Check if /usr/lib64/dirsrv/slapd-instance instance script directory is
created or not.
+
+ :expectedresults:
+ 1. Instance should be created.
+ 2. /usr/lib64/dirsrv/slapd-instance instance script directory should be
created.
+ 3. Instance should be created.
+ 4. /usr/lib64/dirsrv/slapd-instance instance script directory should not be
created.
"""
log.info('set SER_INST_SCRIPTS_ENABLED to {}'.format(config_attr))
@@ -62,11 +64,11 @@ def test_slapd_InstScriptsEnabled(config_attr):
# Checking the presence of instance script directory when SER_INST_SCRIPTS_ENABLED is
set to true and false
if config_attr == 'true':
log.info('checking the presence of instance script directory when
SER_INST_SCRIPTS_ENABLED is set to true')
- assert os.listdir('/usr/lib64/dirsrv/slapd-standalone')
+ assert os.listdir('/usr/lib64/dirsrv/slapd-standalone1')
elif config_attr == 'false':
log.info('checking instance script directory does not present when
SER_INST_SCRIPTS_ENABLED is set to false')
- assert not os.path.exists("/usr/lib64/dirsrv/slapd-standalone")
+ assert not os.path.exists("/usr/lib64/dirsrv/slapd-standalone1")
# Remove instance
standalone.delete()
@@ -77,3 +79,4 @@ if __name__ == '__main__':
# -s for DEBUG mode
CURRENT_FILE = os.path.realpath(__file__)
pytest.main("-s %s" % CURRENT_FILE)
+
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.