Skip to content

Commit

Permalink
Bugfix for WEAVE CI (LLNL#457)
Browse files Browse the repository at this point in the history
* begin work on integration refactor; create fixtures and initial tests

* update CHANGELOG and run fix-style

* add pytest fixtures and README explaining them

* add tests to demonstrate how to use the fixtures

* move/rename some files and modify integration's README

* add password change to redis.pass file

* fix lint issues

* modify redis pwd for test server to be constant for each test

* fix lint issue only caught on github ci

* add fix for merlin server startup

* update CHANGELOG
  • Loading branch information
bgunnar5 authored Nov 15, 2023
1 parent 5dc8206 commit 38651f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added
- Pytest fixtures in the `conftest.py` file of the integration test suite
- NOTE: an export command `export LC_ALL='C'` had to be added to fix a bug in the WEAVE CI. This can be removed when we resolve this issue for the `merlin server` command
- Tests for the `celeryadapter.py` module

## [1.11.1]
Expand Down
3 changes: 2 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ def redis_server(merlin_server_dir: str, redis_pass: str) -> str: # pylint: dis
"""
# Start the local redis server
try:
subprocess.run("merlin server start", shell=True, capture_output=True, text=True, timeout=5)
# Need to set LC_ALL='C' before starting the server or else redis causes a failure
subprocess.run("export LC_ALL='C'; merlin server start", shell=True, capture_output=True, text=True, timeout=5)
except subprocess.TimeoutExpired:
pass

Expand Down

0 comments on commit 38651f2

Please sign in to comment.