diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2017-09-17 15:31:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 15:31:32 -0700 |
| commit | eb0ea7697ac3cc903051157f2580d03d073b325a (patch) | |
| tree | 4a2f655cc602201b8b7aaa7842e3846b628ca862 /lib | |
| parent | 2d22a88a969fe1ab056e8b16d0b1da1602097cb8 (diff) | |
| download | spack-eb0ea7697ac3cc903051157f2580d03d073b325a.tar.gz spack-eb0ea7697ac3cc903051157f2580d03d073b325a.tar.bz2 spack-eb0ea7697ac3cc903051157f2580d03d073b325a.tar.xz spack-eb0ea7697ac3cc903051157f2580d03d073b325a.zip | |
Fix log error parsing bug introduced in c830eda0e (#5387)
- '\b' in regular expression needs to be in a raw string (r'\b')
- Regression test that would've caught this was unintentionally disabled
- This fixes the string and the test
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/test/cmd/install.py | 4 | ||||
| -rw-r--r-- | lib/spack/spack/util/log_parse.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index 10dedeac68..80ecc1249d 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -114,8 +114,8 @@ def test_package_output(tmpdir, capsys, install_mockery, mock_fetch): assert "'install'\nAFTER INSTALL" in out -def _test_install_output_on_build_error(builtin_mock, mock_archive, mock_fetch, - config, install_mockery, capfd): +def test_install_output_on_build_error(builtin_mock, mock_archive, mock_fetch, + config, install_mockery, capfd): # capfd interferes with Spack's capturing with capfd.disabled(): out = install('build-error', fail_on_error=False) diff --git a/lib/spack/spack/util/log_parse.py b/lib/spack/spack/util/log_parse.py index a9ff356aff..53a0a7e7f2 100644 --- a/lib/spack/spack/util/log_parse.py +++ b/lib/spack/spack/util/log_parse.py @@ -86,7 +86,7 @@ def parse_log_events(logfile, context=6): log_events = [] for i, line in enumerate(lines): - if re.search('\berror:', line, re.IGNORECASE): + if re.search(r'\berror:', line, re.IGNORECASE): event = LogEvent( line.strip(), i + 1, |