Merge branch 'ARI-5379' into qa

This commit is contained in:
Barbara Miller 2018-01-31 13:22:20 -08:00
commit d57c45a3be

View File

@ -456,7 +456,7 @@ class Browser:
behavior_script, behavior_timeout_custom = brozzler.behavior_script(
page_url, behavior_parameters,
behaviors_dir=behaviors_dir)
if behavior_timeout_custom > behavior_timeout:
if behavior_timeout_custom and behavior_timeout_custom > behavior_timeout:
behavior_timeout = behavior_timeout_custom
self.run_behavior(behavior_script, timeout=behavior_timeout)
if skip_extract_outlinks: