websms/freeipa
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Imported Debian patch 4.8.10-2

Browse Source
This commit is contained in:
Timo Aaltonen
2020-11-23 20:48:56 +02:00
committed by Mario Fetka
parent 8bc559c5a1
commit 358acdd85f
917 changed files with 1185414 additions and 1069733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ipatests/test_install/test_changeconf.py
View File

@@ -3,7 +3,7 @@
from __future__ import absolute_import
import pytest
from ipaclient.install.ipachangeconf import IPAChangeConf
from ipapython.ipachangeconf import IPAChangeConf
@pytest.fixture(scope='function')

102
ipatests/test_install/test_updates.py
View File

@@ -23,7 +23,6 @@ Test the `ipaserver/install/ldapupdate.py` module.
from __future__ import absolute_import
import os
import unittest
import pytest
@@ -32,7 +31,7 @@ from ipalib import errors
from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax
from ipaserver.install import installutils
from ipapython import ipaldap
from ipaplatform.paths import paths
from ipaplatform.constants import constants as platformconstants
from ipapython.dn import DN
"""
@@ -50,36 +49,36 @@ The DM password needs to be set in ~/.ipa/.dmpw
@pytest.mark.tier0
@pytest.mark.needs_ipaapi
class test_update(unittest.TestCase):
class TestUpdate:
"""
Test the LDAP updater.
"""
def setUp(self):
@pytest.fixture(autouse=True)
def update_setup(self, request):
fqdn = installutils.get_fqdn()
pwfile = api.env.dot_ipa + os.sep + ".dmpw"
if os.path.isfile(pwfile):
fp = open(pwfile, "r")
self.dm_password = fp.read().rstrip()
fp.close()
with open(pwfile, "r") as fp:
self.dm_password = fp.read().rstrip()
else:
raise unittest.SkipTest("No directory manager password")
pytest.skip("No directory manager password")
self.updater = LDAPUpdate(dm_password=self.dm_password, sub_dict={})
ldap_uri = ipaldap.get_ldap_uri(fqdn)
self.ld = ipaldap.LDAPClient(ldap_uri)
self.ld = ipaldap.LDAPClient.from_hostname_secure(fqdn)
self.ld.simple_bind(bind_dn=ipaldap.DIRMAN_DN,
bind_password=self.dm_password)
self.testdir = os.path.abspath(os.path.dirname(__file__))
if not os.path.isfile(os.path.join(self.testdir,
"0_reset.update")):
raise unittest.SkipTest("Unable to find test update files")
pytest.skip("Unable to find test update files")
self.container_dn = DN(self.updater._template_str('cn=test, cn=accounts, $SUFFIX'))
self.user_dn = DN(self.updater._template_str('uid=tuser, cn=test, cn=accounts, $SUFFIX'))
def tearDown(self):
if self.ld:
self.ld.unbind()
def fin():
if self.ld:
self.ld.unbind()
request.addfinalizer(fin)
def test_0_reset(self):
"""
@@ -92,13 +91,13 @@ class test_update(unittest.TestCase):
# Just means the entry doesn't exist yet
modified = True
self.assertTrue(modified)
assert modified
with self.assertRaises(errors.NotFound):
with pytest.raises(errors.NotFound):
self.ld.get_entries(
self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
with self.assertRaises(errors.NotFound):
with pytest.raises(errors.NotFound):
self.ld.get_entries(
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
@@ -109,32 +108,33 @@ class test_update(unittest.TestCase):
modified = self.updater.update([os.path.join(self.testdir,
"1_add.update")])
self.assertTrue(modified)
assert modified
entries = self.ld.get_entries(
self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1)
assert len(entries) == 1
entry = entries[0]
objectclasses = entry.get('objectclass')
for item in ('top', 'nsContainer'):
self.assertTrue(item in objectclasses)
assert item in objectclasses
self.assertEqual(entry.single_value['cn'], 'test')
assert entry.single_value['cn'] == 'test'
entries = self.ld.get_entries(
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1)
assert len(entries) == 1
entry = entries[0]
objectclasses = entry.get('objectclass')
for item in ('top', 'person', 'posixaccount', 'krbprincipalaux', 'inetuser'):
self.assertTrue(item in objectclasses)
assert item in objectclasses
self.assertEqual(entry.single_value['loginshell'], paths.BASH)
self.assertEqual(entry.single_value['sn'], 'User')
self.assertEqual(entry.single_value['uid'], 'tuser')
self.assertEqual(entry.single_value['cn'], 'Test User')
actual = entry.single_value['loginshell']
assert actual == platformconstants.DEFAULT_ADMIN_SHELL
assert entry.single_value['sn'] == 'User'
assert entry.single_value['uid'] == 'tuser'
assert entry.single_value['cn'] == 'Test User'
def test_2_update(self):
@@ -143,13 +143,13 @@ class test_update(unittest.TestCase):
"""
modified = self.updater.update([os.path.join(self.testdir,
"2_update.update")])
self.assertTrue(modified)
assert modified
entries = self.ld.get_entries(
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1)
assert len(entries) == 1
entry = entries[0]
self.assertEqual(entry.single_value['gecos'], 'Test User')
assert entry.single_value['gecos'] == 'Test User'
def test_3_update(self):
"""
@@ -157,13 +157,13 @@ class test_update(unittest.TestCase):
"""
modified = self.updater.update([os.path.join(self.testdir,
"3_update.update")])
self.assertTrue(modified)
assert modified
entries = self.ld.get_entries(
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1)
assert len(entries) == 1
entry = entries[0]
self.assertEqual(entry.single_value['gecos'], 'Test User New')
assert entry.single_value['gecos'] == 'Test User New'
def test_4_update(self):
"""
@@ -171,13 +171,13 @@ class test_update(unittest.TestCase):
"""
modified = self.updater.update([os.path.join(self.testdir,
"4_update.update")])
self.assertTrue(modified)
assert modified
entries = self.ld.get_entries(
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1)
assert len(entries) == 1
entry = entries[0]
self.assertEqual(entry.single_value['gecos'], 'Test User New2')
assert entry.single_value['gecos'] == 'Test User New2'
def test_5_update(self):
"""
@@ -185,13 +185,15 @@ class test_update(unittest.TestCase):
"""
modified = self.updater.update([os.path.join(self.testdir,
"5_update.update")])
self.assertTrue(modified)
assert modified
entries = self.ld.get_entries(
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1)
assert len(entries) == 1
entry = entries[0]
self.assertEqual(sorted(entry.get('cn')), sorted(['Test User', 'Test User New']))
actual = sorted(entry.get('cn'))
expected = sorted(['Test User', 'Test User New'])
assert actual == expected
def test_6_update(self):
"""
@@ -199,13 +201,13 @@ class test_update(unittest.TestCase):
"""
modified = self.updater.update([os.path.join(self.testdir,
"6_update.update")])
self.assertTrue(modified)
assert modified
entries = self.ld.get_entries(
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1)
assert len(entries) == 1
entry = entries[0]
self.assertEqual(sorted(entry.get('cn')), sorted(['Test User']))
assert sorted(entry.get('cn')) == sorted(['Test User'])
def test_6_update_1(self):
"""
@@ -213,13 +215,13 @@ class test_update(unittest.TestCase):
"""
modified = self.updater.update([os.path.join(self.testdir,
"6_update.update")])
self.assertFalse(modified)
assert not modified
entries = self.ld.get_entries(
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1)
assert len(entries) == 1
entry = entries[0]
self.assertEqual(sorted(entry.get('cn')), sorted(['Test User']))
assert sorted(entry.get('cn')) == sorted(['Test User'])
def test_7_cleanup(self):
"""
@@ -232,13 +234,13 @@ class test_update(unittest.TestCase):
# Just means the entry doesn't exist yet
modified = True
self.assertTrue(modified)
assert modified
with self.assertRaises(errors.NotFound):
with pytest.raises(errors.NotFound):
self.ld.get_entries(
self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
with self.assertRaises(errors.NotFound):
with pytest.raises(errors.NotFound):
self.ld.get_entries(
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
@@ -246,7 +248,7 @@ class test_update(unittest.TestCase):
"""
Test the updater with an unknown keyword (test_8_badsyntax)
"""
with self.assertRaises(BadSyntax):
with pytest.raises(BadSyntax):
self.updater.update(
[os.path.join(self.testdir, "8_badsyntax.update")])
@@ -254,6 +256,6 @@ class test_update(unittest.TestCase):
"""
Test the updater with an incomplete line (test_9_badsyntax)
"""
with self.assertRaises(BadSyntax):
with pytest.raises(BadSyntax):
self.updater.update(
[os.path.join(self.testdir, "9_badsyntax.update")])