Attachment #5505 for bug #32554

(-)univention/testing/udm_extensions.py (-2 / +2 lines)

Lines 222-228	Link Here

222

	if not app_id:

222

	if not app_id:

223

		app_id = ''

223

		app_id = ''

224

	else:

224

	else:

225

		app_id = 'UNIVENTION_APP_IDENTIFIER="%s"' % app_id

225

		app_id = 'export UNIVENTION_APP_IDENTIFIER="%s"' % app_id

226

	if not version_start:

226

	if not version_start:

227

		version_start = ''

227

		version_start = ''

228

	else:

228

	else:

Lines 269-275	Link Here

269

	if not app_id:

269

	if not app_id:

270

		app_id = ''

270

		app_id = ''

271

	else:

271

	else:

272

		app_id = 'UNIVENTION_APP_IDENTIFIER="%s"' % app_id

272

		app_id = 'export UNIVENTION_APP_IDENTIFIER="%s"' % app_id

273

	if not version_start:

273

	if not version_start:

274

		version_start = ''

274

		version_start = ''

275

	else:

275

	else:

(-)tests/72_udm-extensions/24_update_packageversion (-1 / +1 lines)

Lines 1-5	Link Here

#!/usr/share/ucs-test/runner python

#!/usr/share/ucs-test/runner python

## desc: Change version range of an existing extension

## desc: Change version of an existing extension

## tags: [udm-ldapextensions,apptest]

## tags: [udm-ldapextensions,apptest]

## roles: [domaincontroller_master,domaincontroller_backup,domaincontroller_slave,memberserver]

## roles: [domaincontroller_master,domaincontroller_backup,domaincontroller_slave,memberserver]

## exposure: dangerous

## exposure: dangerous

(-)tests/72_udm-extensions/10_update_extension_via_package (-2 / +2 lines)

Lines 31-39	Link Here

			version_start = random_ucs_version(max_major=2)

			version_start = random_ucs_version(max_major=2)

			version_end = random_ucs_version(min_major=5)

			version_end = random_ucs_version(min_major=5)

			# create special extension name

			# create unique extension identifier

			extension_identifier = '%s_%s' % (extension_name, package_version.replace('.','_'))

			extension_identifier = '%s_%s' % (extension_name, package_version.replace('.','_'))

			extension_buffer = get_extension_buffer(extension_type, extension_identifier)

			extension_buffer = get_extension_buffer(extension_type, extension_name, extension_identifier)

			joinscript_buffer = get_join_script_buffer(extension_type,

			joinscript_buffer = get_join_script_buffer(extension_type,

													  '/usr/share/%s/%s' % (package_name, extension_filename),

													  '/usr/share/%s/%s' % (package_name, extension_filename),

													  app_id=app_id,

													  app_id=app_id,

(-)tests/72_udm-extensions/12_update_extension_via_other_packagename (-2 / +2 lines)

Lines 31-39	Link Here

			version_start = random_ucs_version(max_major=2)

			version_start = random_ucs_version(max_major=2)

			version_end = random_ucs_version(min_major=5)

			version_end = random_ucs_version(min_major=5)

			# create special extension name

			# create unique extension identifier

			extension_identifier = '%s_%s' % (extension_name, package_version.replace('.','_'))

			extension_identifier = '%s_%s' % (extension_name, package_version.replace('.','_'))

			extension_buffer = get_extension_buffer(extension_type, extension_identifier)

			extension_buffer = get_extension_buffer(extension_type, extension_name, extension_identifier)

			joinscript_buffer = get_join_script_buffer(extension_type,

			joinscript_buffer = get_join_script_buffer(extension_type,

													  '/usr/share/%s/%s' % (package_name, extension_filename),

													  '/usr/share/%s/%s' % (package_name, extension_filename),

													  app_id=app_id,

													  app_id=app_id,





from univention.config_registry import ConfigRegistry
import univention.testing.udm as udm_test
from univention.testing.utils import verify_ldap_object, wait_for_replication, fail
from univention.testing.strings import random_name, random_version, random_ucs_version
from univention.testing.udm_extensions import *
import subprocess

							   ucsversionend = version_end,
							   active = 'FALSE')

		wait_for_replication()
		udm.stop_cli_server()

		verify_ldap_object(dn, {


				})

		output, stderr = subprocess.Popen(['udm', 'modules'], stdout=subprocess.PIPE).communicate()
		if not extension_name in output:
			fail('ERROR: udm cli server has not been reloaded yet or module registration failed')

		extension_dn = udm.create_object(extension_name, position=ucr.get('ldap/base'), name=object_name)
		udm.remove_object(extension_name, dn=extension_dn)

	wait_for_replication()
	udm.stop_cli_server()

	with udm_test.UCSTestUDM() as udm:

(-)tests/72_udm-extensions/21_listener_version_start_end (-1 / +1 lines)

Lines 33-39	Link Here

			('5.0-0', '9.9-9', False),   # range above current version

			('5.0-0', '9.9-9', False),   # range above current version

			('1.0-0', '9.9-9', True),    # current version in range

			('1.0-0', '9.9-9', True),    # current version in range

			('1.0-0', '%s-%s' % (ucr.get('version/version'), ucr.get('version/patchlevel')), True),  # upper limit of range is current version

			('1.0-0', '%s-%s' % (ucr.get('version/version'), ucr.get('version/patchlevel')), True),  # upper limit of range is current version

			('%s-%s' % (ucr.get('version/version'), ucr.get('version/patchlevel')), '9.9-9'), True): # lower limit of range is current version

			('%s-%s' % (ucr.get('version/version'), ucr.get('version/patchlevel')), '9.9-9', True)): # lower limit of range is current version

			print '=== Testing range from %s to %s with expected result exists=%s ===' % (version_start, version_end, should_exist)

			print '=== Testing range from %s to %s with expected result exists=%s ===' % (version_start, version_end, should_exist)

			with udm_test.UCSTestUDM() as udm:

			with udm_test.UCSTestUDM() as udm:




	packages = []
	try:
		for package_version in (package_version_HIGH, package_version_LOW):
			# create unique extension identifier
			extension_identifier = '%s_%s' % (extension_name, package_version.replace('.','_'))
			extension_buffer = get_extension_buffer(extension_type, extension_name, extension_identifier)
			joinscript_buffer = get_join_script_buffer(extension_type,
													  '/usr/share/%s/%s' % (package_name, extension_filename),
													  app_id=app_id,

			package.install()

			exitcode = call_join_script('66%s.inst' % package_name, fail_on_error=False)
			if package_version == package_version_HIGH:
				if exitcode:
					fail('The join script failed with exitcode %s' % exitcode)
			else:

			content = open(get_absolute_extension_filename(extension_type, extension_filename)).read()
			if package_version == package_version_HIGH and not extension_identifier in content:
				fail('ERROR: UDM extension of package %d has not been written to disk (%s)' % (len(packages), extension_filename,))
			if package_version == package_version_LOW and extension_identifier in content:
				fail('ERROR: the extension update has been performed but should not (old version=%s ; new version=%s)' % (package_version_HIGH, package_version_LOW))

	finally:

Return to bug 32554