Skip to content

Commit dfc4126

Browse files
committed
Enable queue ops test
1 parent 5e1b3a5 commit dfc4126

2 files changed

Lines changed: 44 additions & 2 deletions

File tree

shapeflow/video.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,7 @@ def set_config(self, config: dict, silent: bool = False) -> dict:
11661166
do_commit = True
11671167

11681168
# Check for mask adjustments
1169-
if previous_masks != self.config.masks:
1169+
if hasattr(self, 'design') and previous_masks != self.config.masks:
11701170
for i, mask in enumerate(self.design.masks):
11711171
mask.set_config(self.config.masks[i].to_dict())
11721172

test/test_main.py

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,49 @@ class ServerAnalyzerTest(unittest.TestCase):
196196
"feature_parameters": [{}],
197197
"frame_interval_setting": 'Nf',
198198
'Nf': 5,
199+
'masks': [
200+
{
201+
'name': 'SLC',
202+
'filter': {
203+
'type': 'HsvRangeFilter',
204+
'data': {
205+
'color': { 'h': 75, 's': 75, 'v': 75 }
206+
}
207+
}
208+
},
209+
{
210+
'name': 'PM_block',
211+
'skip': True,
212+
},
213+
{
214+
'name': 'block',
215+
'skip': True,
216+
},
217+
{
218+
'name': 'PM_iSIMPLE',
219+
'skip': True,
220+
},
221+
{
222+
'name': 'WLC_iSIMPLE',
223+
'skip': True,
224+
},
225+
{
226+
'name': 'push2',
227+
'skip': True,
228+
},
229+
{
230+
'name': 'push1',
231+
'skip': True,
232+
},
233+
{
234+
'name': 'PM_SIMPLE',
235+
'skip': True,
236+
},
237+
{
238+
'name': 'WLC_SIMPLE',
239+
'skip': True,
240+
},
241+
]
199242
}
200243
ROI = {
201244
'BL': {'x': 0.8187, 'y': 0.2389},
@@ -598,7 +641,6 @@ def test_clean_db(self):
598641
finally:
599642
clear_files()
600643

601-
@unittest.skip("doesn't work after 06024b46") # todo: have to bypass CAN_FILTER by setting up all masks
602644
def test_analyzers_queue_ops(self):
603645
with application() as (server, analyzers, history, client, settings):
604646
id1 = json.loads(client.post('/api/va/init').data)

0 commit comments

Comments
 (0)