View | Details | Raw Unified | Return to bug 48080 | Differences between
and this patch

Collapse All | Expand All

(-)a/ucs-school-umc-exam/umc/python/schoolexam-master/__init__.py (-3 / +3 lines)
 Lines 429-438   class Instance(SchoolBaseModule): Link Here 
429
		teacher_pc_role = create_ucsschool_role_string(role_teacher_computer, room.school)
429
		teacher_pc_role = create_ucsschool_role_string(role_teacher_computer, room.school)
430
		exam_hosts = list()
430
		exam_hosts = list()
431
		for host in room.hosts:
431
		for host in room.hosts:
432
			host_obj = SchoolComputer.from_dn(host, None, ldap_user_read) # Please remove with Bug #49611
432
			host_obj = SchoolComputer.from_dn(host, None, ldap_user_read)  # Please remove with Bug #49611
433
			host_obj = SchoolComputer.from_dn(host, None, ldap_user_read)
433
			host_obj = SchoolComputer.from_dn(host, None, ldap_user_read)
434
		if teacher_pc_role not in host_obj.ucsschool_roles:
434
			if teacher_pc_role not in host_obj.ucsschool_roles:
435
			exam_hosts.append(host)
435
				exam_hosts.append(host)
436
		# Add all host members of room to examGroup
436
		# Add all host members of room to examGroup
437
		host_uid_list = [univention.admin.uldap.explodeDn(uniqueMember, 1)[0] + '$' for uniqueMember in exam_hosts]
437
		host_uid_list = [univention.admin.uldap.explodeDn(uniqueMember, 1)[0] + '$' for uniqueMember in exam_hosts]
438
		examGroup = self.examGroup(ldap_admin_write, ldap_position, room.school)
438
		examGroup = self.examGroup(ldap_admin_write, ldap_position, room.school)
(-)a/ucs-test-ucsschool/debian/changelog (+6 lines)
 Lines 1-3    Link Here 
1
ucs-test-ucsschool (6.0.22) unstable; urgency=medium
2
3
  * Bug #48080: fix 101_exam_mode_group_members
4
5
 -- Jürn Brodersen <brodersen@univention.de>  Wed, 19 Jun 2019 11:47:29 +0200
6
1
ucs-test-ucsschool (6.0.21) unstable; urgency=low
7
ucs-test-ucsschool (6.0.21) unstable; urgency=low
2
8
3
  * Bug #47978: fix selenium/02_internet_rules
9
  * Bug #47978: fix selenium/02_internet_rules
(-)a/ucs-test-ucsschool/modules/univention/testing/ucsschool/ucs_test_school.py (-2 / +8 lines)
 Lines 62-67   from ucsschool.lib.roles import ( Link Here 
62
from ucsschool.lib.models import School, User, Student, Teacher, TeachersAndStaff, Staff, SchoolClass, WorkGroup
62
from ucsschool.lib.models import School, User, Student, Teacher, TeachersAndStaff, Staff, SchoolClass, WorkGroup
63
from ucsschool.lib.models.utils import add_stream_logger_to_schoollib, get_stream_handler, UniStreamHandler
63
from ucsschool.lib.models.utils import add_stream_logger_to_schoollib, get_stream_handler, UniStreamHandler
64
from ucsschool.lib.models.group import ComputerRoom
64
from ucsschool.lib.models.group import ComputerRoom
65
from ucsschool.lib.models.computer import SchoolComputer
65
try:
66
try:
66
	from typing import Dict, List, Optional, Tuple
67
	from typing import Dict, List, Optional, Tuple
67
except ImportError:
68
except ImportError:
 Lines 789-800   class UCSTestSchool(object): Link Here 
789
			'name': '%s-%s' % (ou_name, name),
790
			'name': '%s-%s' % (ou_name, name),
790
			'description': description,
791
			'description': description,
791
			'hosts': host_members,
792
			'hosts': host_members,
792
			'teacher_computers': teacher_computers
793
		}
793
		}
794
		logger.info('*** Creating new room %r', name)
794
		logger.info('*** Creating new room %r with settings %r', name, kwargs)
795
		obj = ComputerRoom(**kwargs)
795
		obj = ComputerRoom(**kwargs)
796
		result = obj.create(self.lo)
796
		result = obj.create(self.lo)
797
		logger.info('*** Result of ComputerRoom(...).create(): %r', result)
797
		logger.info('*** Result of ComputerRoom(...).create(): %r', result)
798
		logger.info('*** Setting up teacher computers: {}'.format(teacher_computers))
799
		for teacher_pc in teacher_computers:
800
			pc = SchoolComputer.from_dn(teacher_pc, ou_name, self.lo)
801
			pc.teacher_computer = True
802
			pc.modify(self.lo)
803
		logger.info('*** Teacher computer set up')
798
		if wait_for_replication:
804
		if wait_for_replication:
799
			utils.wait_for_replication()
805
			utils.wait_for_replication()
800
		utils.verify_ldap_object(obj.dn, expected_attr={'ucsschoolRole': [create_ucsschool_role_string(role_computer_room, ou_name)]}, strict=False, should_exist=True)
806
		utils.verify_ldap_object(obj.dn, expected_attr={'ucsschoolRole': [create_ucsschool_role_string(role_computer_room, ou_name)]}, strict=False, should_exist=True)

Return to bug 48080