From 13bfbdcbbcf57dc9c928716e28dd3db9ac1af635 Mon Sep 17 00:00:00 2001 From: kakwa Date: Thu, 7 Feb 2019 22:07:28 +0100 Subject: [PATCH] add requirements files for simulating RHEL 7 and Debian 9 --- .travis.yml | 34 ++++++++++++++++++++++++++-------- requirements-el7.txt | 4 ++++ requirements-stretch.txt | 4 ++++ tests/test_env/deploy.sh | 6 ++++-- 4 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 requirements-el7.txt create mode 100644 requirements-stretch.txt diff --git a/.travis.yml b/.travis.yml index 5ea306d..3054b57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_install: - '[ "$TEST_PEP8" == "1" ] || sudo ./tests/test_env/deploy.sh' install: - - pip install -e . + - pip install -e -r $REQ_FILE - "if [[ $TEST_PEP8 == '1' ]]; then pip install pycodestyle; fi" - pip install passlib - pip install coveralls @@ -22,15 +22,33 @@ script: "if [[ $TEST_PEP8 == '1' ]]; then pycodestyle --repeat --show-source --e matrix: include: - python: "2.7" - env: TEST_PEP8=1 + env: + TEST_PEP8=1 + REQ_FILE=requirements.txt - python: "2.7" - env: TEST_PEP8=0 - - python: "3.5" - env: TEST_PEP8=0 - - python: "3.6" - env: TEST_PEP8=0 + env: + TEST_PEP8=0 + REQ_FILE=requirements-el7.txt + - python: "2.7" + env: + TEST_PEP8=0 + REQ_FILE=requirements-stretch.txt + - python: "2.7" + env: + TEST_PEP8=0 + REQ_FILE=requirements.txt - python: "3.4" - env: TEST_PEP8=0 + env: + TEST_PEP8=0 + REQ_FILE=requirements-el7.txt + - python: "3.5" + env: + TEST_PEP8=0 + REQ_FILE=requirements-stretch.txt + - python: "3.6" + env: + TEST_PEP8=0 + REQ_FILE=requirements.txt after_success: - coveralls diff --git a/requirements-el7.txt b/requirements-el7.txt new file mode 100644 index 0000000..109ab48 --- /dev/null +++ b/requirements-el7.txt @@ -0,0 +1,4 @@ +CherryPy>=3.0.0 +PyYAML +Mako +python-ldap==2.4.15 diff --git a/requirements-stretch.txt b/requirements-stretch.txt new file mode 100644 index 0000000..dcdcf36 --- /dev/null +++ b/requirements-stretch.txt @@ -0,0 +1,4 @@ +CherryPy>=3.0.0 +PyYAML +Mako +python-ldap==2.4.28 diff --git a/tests/test_env/deploy.sh b/tests/test_env/deploy.sh index 423f078..19e0d83 100755 --- a/tests/test_env/deploy.sh +++ b/tests/test_env/deploy.sh @@ -48,8 +48,9 @@ role=dc sambacmd=samba-tool adpass=qwertyP455 +systemctl unmask samba-ad-dc + hostname ad.ldapcherry.org -/etc/init.d/dnsmasq stop pkill -9 dnsmasq kill -9 `cat /var/run/samba/smbd.pid` @@ -75,10 +76,11 @@ mv /var/lib/samba/private/krb5.conf /etc/krb5.conf sleep 5 +systemctl start samba-ad-dc /etc/init.d/samba-ad-dc start cat /var/log/samba/* sleep 5 -netstat -apn | grep samba +ss -apn | grep samba