diff options
| author | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-03-07 14:56:43 +0000 |
|---|---|---|
| committer | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-03-13 12:03:13 +0000 |
| commit | 9be5a16c768a0818e2b722585a6d9ab1c72051de (patch) | |
| tree | 7c8005910f69364fae7b23ce28795e82b8990cd8 | |
| parent | 5e299889e846c85973c6450384a09f8f623310be (diff) | |
| download | buildstream-9be5a16c768a0818e2b722585a6d9ab1c72051de.tar.gz | |
Remove other references to SequenceID from the code and tests
widget.py: Remove SequenceID from the list of widgets.
tests/frontend/logging.py: Remove %{sequence} check.
| -rw-r--r-- | buildstream/_frontend/widget.py | 3 | ||||
| -rw-r--r-- | tests/frontend/logging.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/buildstream/_frontend/widget.py b/buildstream/_frontend/widget.py index 34d0919aa..2eb9e10ba 100644 --- a/buildstream/_frontend/widget.py +++ b/buildstream/_frontend/widget.py @@ -353,8 +353,7 @@ class LogLine(Widget): "key": CacheKey(content_profile, format_profile, err_profile), "element": ElementName(content_profile, format_profile), "action": TypeName(content_profile, format_profile), - "message": MessageOrLogFile(content_profile, format_profile, err_profile), - "sequence": SequenceID(content_profile, format_profile) + "message": MessageOrLogFile(content_profile, format_profile, err_profile) } logfile_tokens = self._parse_logfile_format(logfile_format, content_profile, format_profile) self.columns.extend(logfile_tokens) diff --git a/tests/frontend/logging.py b/tests/frontend/logging.py index 91b44046c..5bfdbd6eb 100644 --- a/tests/frontend/logging.py +++ b/tests/frontend/logging.py @@ -51,7 +51,7 @@ def test_custom_logging(cli, tmpdir, datafiles): element_path = os.path.join(project, 'elements') element_name = 'fetch-test-git.bst' - custom_log_format = '%{elapsed},%{elapsed-us},%{wallclock},%{key},%{element},%{action},%{message},%{sequence}' + custom_log_format = '%{elapsed},%{elapsed-us},%{wallclock},%{key},%{element},%{action},%{message}' user_config = {'logging': {'message-format': custom_log_format}} user_config_file = str(tmpdir.join('buildstream.conf')) _yaml.dump(_yaml.node_sanitize(user_config), filename=user_config_file) @@ -77,5 +77,5 @@ def test_custom_logging(cli, tmpdir, datafiles): result = cli.run(project=project, args=['-c', user_config_file, 'fetch', element_name]) result.assert_success() - m = re.search("\d\d:\d\d:\d\d,\d\d:\d\d:\d\d.\d{6},\d\d:\d\d:\d\d,,,SUCCESS,Checking sources,\d", result.stderr) + m = re.search("\d\d:\d\d:\d\d,\d\d:\d\d:\d\d.\d{6},\d\d:\d\d:\d\d,,,SUCCESS,Checking sources", result.stderr) assert(m is not None) |