Commit f7508762 authored by Matias Guijarro's avatar Matias Guijarro
Browse files

Merge branch '2740-empty-session-reports-errors-in-setup-at-startup' into 'master'

Resolve "Empty session reports errors in setup at startup"

Closes #2740

See merge request !3677
parents cf3877a0 7ae4dd01
Pipeline #46188 failed with stages
in 43 minutes and 59 seconds
......@@ -801,8 +801,14 @@ class Session:
env_dict["user_script_run"] = self.user_script_run
def _setup(self, env_dict, nested=False):
"""
Load an execute setup file.
Called by _do_setup() which is called by setup().
Must return True in case of success.
"""
if self.setup_file is None:
return
return True
print("%s: Executing setup file..." % self.name)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment