Skip to content

Commit 7688b2c

Browse files
author
David Noble
committed
Fixed test breaks related to re-introducing SCPV1 configuration setting "local = {True|False}"
Confirmed through SA-ldapsearch testing: local can be set in code.
1 parent 9650cd6 commit 7688b2c

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
streaming,__mv_streaming
3-
1,
2+
streaming,__mv_streaming,local,__mv_local
3+
1,,0,
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
generates_timeorder,__mv_generates_timeorder,generating,__mv_generating,retainsevents,__mv_retainsevents,streaming,__mv_streaming
3-
0,,1,,0,,1,
2+
generates_timeorder,__mv_generates_timeorder,generating,__mv_generating,local,__mv_local,retainsevents,__mv_retainsevents,streaming,__mv_streaming
3+
0,,1,,0,,0,,1,
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
streaming,__mv_streaming
3-
1,
2+
streaming,__mv_streaming,local,__mv_local
3+
1,,0,

tests/searchcommands/test_configuration_settings.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ def generate(self):
6868

6969
self.assertEqual(
7070
[(name, value) for name, value in command.configuration.iteritems()],
71-
[('generates_timeorder', True), ('generating', True), ('retainsevents', True), ('streaming', True)])
71+
[('generates_timeorder', True), ('generating', True), ('local', False), ('retainsevents', True),
72+
('streaming', True)])
7273

7374
command = TestCommand()
7475
command._protocol_version = 2
@@ -113,14 +114,16 @@ def stream(self, records):
113114

114115
self.assertEqual(
115116
[(name, value) for name, value in command.configuration.iteritems()],
116-
[('streaming', True)])
117+
[('local', False), ('streaming', True)])
117118

118119
self.assertIs(command.configuration.clear_required_fields, False)
120+
self.assertIs(command.configuration.local, False)
119121
self.assertIs(command.configuration.overrides_timeorder, None)
120122
self.assertIs(command.configuration.required_fields, None)
121123
self.assertIs(command.configuration.streaming, True)
122124

123125
command.configuration.clear_required_fields = True
126+
command.configuration.local = True
124127
command.configuration.overrides_timeorder = True
125128
command.configuration.required_fields = ['field_1', 'field_2', 'field_3']
126129

@@ -135,7 +138,7 @@ def stream(self, records):
135138

136139
self.assertEqual(
137140
[(name, value) for name, value in command.configuration.iteritems()],
138-
[('clear_required_fields', True), ('overrides_timeorder', True), ('required_fields', ['field_1', 'field_2', 'field_3']), ('streaming', True)])
141+
[('clear_required_fields', True), ('local', True), ('overrides_timeorder', True), ('required_fields', ['field_1', 'field_2', 'field_3']), ('streaming', True)])
139142

140143
command = TestCommand()
141144
command._protocol_version = 2

0 commit comments

Comments
 (0)