Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Please refer to the [NEWS](NEWS.md) for a list of changes which have an affect o
### Tests
- `intelmq.tests.lib.test_pipeline.TestAmqp.test_acknowledge`: Skip on all Python versions when running on CI (PR#2602 by Sebastian Wagner).
- `.github/workflows/codespell.yml`, `debian-package.yml`, `regexploit.yml`: Upgrade to `ubuntu-latest` runners (PR#2602 by Sebastian Wagner).
- `intelmq.test.test_conf`: With changed behaviour in ruamel.yaml on line wrapping since version 0.18.13, only test the parsabilty of `runtime.yaml` (PR#2619 by Sebastian Wagner).

### Tools
- `intelmq.bin.intelmq_psql_initdb`: Use `JSONB` type by default, Postgres supports it since version 9 (PR#2597 by Sebastian Wagner).
Expand Down
8 changes: 4 additions & 4 deletions intelmq/tests/test_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ def test_harmonization(self):
self.assertGreater(value['length'], 0)
getattr(harmonization, value['type'])

# Line wrapping behaves differently since ruamel.yaml version 0.18.13. Additionally it adds spaces at the end of continued lines.
# https://sourceforge.net/p/ruamel-yaml/code/ci/375c4db4c7c5fad61e149fc0690e50229df23ab3/
# So just test now that the file is parseable
def test_runtime_syntax(self):
""" Test if runtime.yaml has correct syntax. """
""" Test if runtime.yaml has correct syntax (parseable). """
with open(CONF_FILES['runtime']) as fhandle:
fcontent = fhandle.read()
interpreted = yaml.load(fcontent)
buf = io.BytesIO()
yaml.dump(interpreted, buf)
self.assertEqual(buf.getvalue().decode(), fcontent)


class CerberusTests(unittest.TestCase):
Expand Down
Loading