summaryrefslogtreecommitdiff
path: root/systemd
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-09-17 00:05:36 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-09-17 11:53:45 +0200
commitbbbc6e8a921759e9ea7587356fbc1fe689eb77fd (patch)
treeb4a8bc48e70efb29380c411048634672b62a53c6 /systemd
parent008aac74d7756af5d718e6d35c7a62cab0af584d (diff)
downloadpython-systemd-bbbc6e8a921759e9ea7587356fbc1fe689eb77fd.tar.gz
tests: add tests for Reader initialization
Diffstat (limited to 'systemd')
-rw-r--r--systemd/journal.py2
-rw-r--r--systemd/test/test_journal.py39
2 files changed, 40 insertions, 1 deletions
diff --git a/systemd/journal.py b/systemd/journal.py
index 598a085..3fe3d83 100644
--- a/systemd/journal.py
+++ b/systemd/journal.py
@@ -179,7 +179,7 @@ class Reader(_Reader):
return value
def _convert_entry(self, entry):
- """Convert entire journal entry utilising _covert_field"""
+ """Convert entire journal entry utilising _convert_field"""
result = {}
for key, value in entry.items():
if isinstance(value, list):
diff --git a/systemd/test/test_journal.py b/systemd/test/test_journal.py
index 564ead3..e79a410 100644
--- a/systemd/test/test_journal.py
+++ b/systemd/test/test_journal.py
@@ -32,3 +32,42 @@ def test_journalhandler_init_exception():
def test_journalhandler_init():
kw = {'X':3, 'X3':4}
journal.JournalHandler(logging.INFO, **kw)
+
+def test_reader_init_flags():
+ j1 = journal.Reader()
+ j2 = journal.Reader(journal.LOCAL_ONLY)
+ j3 = journal.Reader(journal.RUNTIME_ONLY)
+ j4 = journal.Reader(journal.SYSTEM_ONLY)
+ j5 = journal.Reader(journal.LOCAL_ONLY|
+ journal.RUNTIME_ONLY|
+ journal.SYSTEM_ONLY)
+ j6 = journal.Reader(0)
+
+def test_reader_init_path(tmpdir):
+ j = journal.Reader(path=tmpdir.strpath)
+ with pytest.raises(ValueError):
+ journal.Reader(journal.LOCAL_ONLY, path=tmpdir.strpath)
+
+def test_reader_converters(tmpdir):
+ converters = {'xxx' : lambda arg: 'yyy'}
+ j = journal.Reader(path=tmpdir.strpath, converters=converters)
+
+ val = j._convert_field('xxx', b'abc')
+ assert val == 'yyy'
+
+ val = j._convert_field('zzz', b'\200\200')
+ assert val == b'\200\200'
+
+def test_reader_convert_entry(tmpdir):
+ converters = {'x1' : lambda arg: 'yyy',
+ 'x2' : lambda arg: 'YYY'}
+ j = journal.Reader(path=tmpdir.strpath, converters=converters)
+
+ val = j._convert_entry({'x1' : b'abc',
+ 'y1' : b'\200\200',
+ 'x2' : [b'abc', b'def'],
+ 'y2' : [b'\200\200', b'\200\201']})
+ assert val == {'x1' : 'yyy',
+ 'y1' : b'\200\200',
+ 'x2' : ['YYY', 'YYY'],
+ 'y2' : [b'\200\200', b'\200\201']}