Merge branch 'tests'

Author: keszybz

docs/journal.rst

@@ -41,11 +41,45 @@ event loop:
   >>> from systemd import journal
   >>> j = journal.Reader()
   >>> j.seek_tail()
+  >>> journal.send('testing 1,2,3')   # make sure we have something to read
+  >>> j.add_match('MESSAGE=testing 1,2,3')
   >>> p = select.poll()
   >>> p.register(j, j.get_events())
-  >>> p.poll()
+  >>> p.poll()                        # doctest: +SKIP
   [(3, 1)]
-  >>> j.get_next()
+  >>> j.get_next()                    # doctest: +SKIP
+  {'_AUDIT_LOGINUID': 1000,
+   '_CAP_EFFECTIVE': '0',
+   '_SELINUX_CONTEXT': 'unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023',
+   '_GID': 1000,
+   'CODE_LINE': 1,
+   '_HOSTNAME': '...',
+   '_SYSTEMD_SESSION': 52,
+   '_SYSTEMD_OWNER_UID': 1000,
+   'MESSAGE': 'testing 1,2,3',
+   '__MONOTONIC_TIMESTAMP':
+      journal.Monotonic(timestamp=datetime.timedelta(2, 76200, 811585),
+                        bootid=UUID('958b7e26-df4c-453a-a0f9-a8406cb508f2')),
+   'SYSLOG_IDENTIFIER': 'python3',
+   '_UID': 1000,
+   '_EXE': '/usr/bin/python3',
+   '_PID': 7733,
+   '_COMM': '...',
+   'CODE_FUNC': '<module>',
+   'CODE_FILE': '<doctest journal.rst[4]>',
+   '_SOURCE_REALTIME_TIMESTAMP':
+       datetime.datetime(2015, 9, 5, 13, 17, 4, 944355),
+   '__CURSOR': 's=...',
+   '_BOOT_ID': UUID('958b7e26-df4c-453a-a0f9-a8406cb508f2'),
+   '_CMDLINE': '/usr/bin/python3 ...',
+   '_MACHINE_ID': UUID('263bb31e-3e13-4062-9bdb-f1f4518999d2'),
+   '_SYSTEMD_SLICE': 'user-1000.slice',
+   '_AUDIT_SESSION': 52,
+   '__REALTIME_TIMESTAMP': datetime.datetime(2015, 9, 5, 13, 17, 4, 945110),
+   '_SYSTEMD_UNIT': 'session-52.scope',
+   '_SYSTEMD_CGROUP': '/user.slice/user-1000.slice/session-52.scope',
+   '_TRANSPORT': 'journal'}
+
 
 
 Journal access types

docs/login.rst

@@ -20,9 +20,9 @@ external event loop:
   >>> m = login.Monitor("machine")
   >>> p = select.poll()
   >>> p.register(m, m.get_events())
-  >>> login.machine_names()
+  >>> login.machine_names()               # doctest: +SKIP
   []
-  >>> p.poll()
+  >>> p.poll()                            # doctest: +SKIP
   [(3, 1)]
-  >>> login.machine_names()
+  >>> login.machine_names()               # doctest: +SKIP
   ['fedora-19.nspawn']

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+addopts = --doctest-modules --doctest-glob=*.rst --ignore=setup.py
+norecursedirs = .git build