Refactor everserver 2 #9777
Open
Refactor everserver 2 #9777
+388
−94
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
frode-aarstad
force-pushed
the
refactor-everserver-2
branch
from
3058d26 to
249e947
Compare
frode-aarstad
force-pushed
the
refactor-everserver-2
branch
from
249e947 to
d0b2ca4
Compare
CodSpeed Performance ReportMerging #9777 will not alter performanceComparing Summary
|
frode-aarstad
force-pushed
the
refactor-everserver-2
branch
from
1e6e488 to
071bbbc
Compare
frode-aarstad
added
the
release-notes:maintenance
oyvindeide
reviewed
Jan 20, 2025
| ) | ||
|
|
||
| if self._everest_config.simulator.queue_system.name == "local": | ||
| # if run_model._queue_config.queue_system == QueueSystem.LOCAL: |
There was a problem hiding this comment.
Should be able to just use the commented out line, as it is lower case everywhere now.
| is_done = False | ||
| exit_code = None | ||
| # loop unil the optimization is done | ||
| while not is_done: |
There was a problem hiding this comment.
Very minor and only if you a agree, but suggest a rename to: done, think it reads a bit better.
| @@ -41,7 +41,7 @@ | |||
| from everest.util import makedirs_if_needed | |||
|
|
|||
|
|
|||
| @pytest.mark.flaky(reruns=5) | |||
| # @pytest.mark.flaky(reruns=5) | |||
| from everest.util import makedirs_if_needed | ||
|
|
||
|
|
||
| def _string_exists_in_file(file_path, string): | ||
| return string in Path(file_path).read_text(encoding="utf-8") | ||
|
|
||
|
|
||
| @pytest.mark.flaky(reruns=5) | ||
| # @pytest.mark.flaky(reruns=5) |
Comment on lines
+269
to
+284
| async def server_running(): | ||
| while True: | ||
| event = await driver.event_queue.get() | ||
| if isinstance(event, FinishedEvent) and event.iens == 0: | ||
| return | ||
|
|
||
| driver = await start_server(config, debug=True) | ||
| try: | ||
| wait_for_server(config.output_dir, 120) | ||
| start_experiment( | ||
| server_context=ServerConfig.get_server_context(config.output_dir), | ||
| config=config, | ||
| ) | ||
| except (SystemExit, RuntimeError) as e: | ||
| raise e | ||
| await server_running() |
There was a problem hiding this comment.
Perhaps make this a small function for reuse? Looks like it can be used in the test below as well?
| def extract_errors_from_file(path: str): | ||
| with open(path, encoding="utf-8") as f: | ||
| content = f.read() | ||
| return re.findall(r"(Error \w+.*)", content) | ||
|
|
||
|
|
||
| def wait_for_server_simple( |
There was a problem hiding this comment.
Would it be possible to join this with wait_for_server?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue
Resolves #9290
Approach
Short description of the approach
(Screenshot of new behavior in GUI if applicable)
git rebase -i main --exec 'pytest tests/ert/unit_tests -n logical -m "not integration_test"')When applicable