Merge pull request #34 from keszybz/test-skipping

Improve test skipping on old systems.

Author: keszybz

docs/login.rst

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

setup.py

@@ -92,7 +92,9 @@ def lib(*names, **kw):
            'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)',
            ],
        py_modules = ['systemd.journal', 'systemd.daemon',
-                     'systemd.test.test_daemon', 'systemd.test.test_journal'],
+                     'systemd.test.test_daemon',
+                     'systemd.test.test_journal',
+                     'systemd.test.test_login'],
        ext_modules = [_journal,
                       _reader,
                       _daemon,

systemd/daemon.py

@@ -1,3 +1,5 @@
+from socket import AF_UNSPEC as _AF_UNSPEC
+
 from ._daemon import (__version__,
                       booted,
                       notify,
@@ -9,7 +11,6 @@
                       _is_socket_unix,
                       _is_mq,
                       LISTEN_FDS_START)
-from socket import AF_UNSPEC as _AF_UNSPEC
 
 def _convert_fileobj(fileobj):
     try:

systemd/journal.py

@@ -26,10 +26,11 @@
 import traceback as _traceback
 import os as _os
 import logging as _logging
-if _sys.version_info >= (3,3):
-    from collections import ChainMap as _ChainMap
 from syslog import (LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR,
                     LOG_WARNING, LOG_NOTICE, LOG_INFO, LOG_DEBUG)
+if _sys.version_info >= (3,3):
+    from collections import ChainMap as _ChainMap
+
 from ._journal import __version__, sendv, stream_fd
 from ._reader import (_Reader, NOP, APPEND, INVALIDATE,
                       LOCAL_ONLY, RUNTIME_ONLY,
@@ -225,8 +226,8 @@ def __next__(self):
     def add_match(self, *args, **kwargs):
         """Add one or more matches to the filter journal log entries.
 
-        All matches of different field are combined in a logical AND, and
-        matches of the same field are automatically combined in a logical OR.
+        All matches of different field are combined with logical AND, and
+        matches of the same field are automatically combined with logical OR.
         Matches can be passed as strings of form "FIELD=value", or keyword
         arguments FIELD="value".
         """
@@ -241,7 +242,7 @@ def get_next(self, skip=1):
         Entries will be processed with converters specified during Reader
         creation.
 
-        Optional skip value will return the `skip`\-th log entry.
+        Optional `skip` value will return the `skip`-th log entry.
 
         Currently a standard dictionary of fields is returned, but in the
         future this might be changed to a different mapping type, so the
@@ -261,7 +262,7 @@ def get_previous(self, skip=1):
 
         Equivalent to get_next(-skip).
 
-        Optional skip value will return the -`skip`\-th log entry.
+        Optional `skip` value will return the -`skip`-th log entry.
 
         Entries will be processed with converters specified during Reader
         creation.
@@ -561,7 +562,7 @@ def emit(self, record):
             msg = self.format(record)
             pri = self.mapPriority(record.levelno)
             mid = getattr(record, 'MESSAGE_ID', None)
-            extras = { k:str(v) for k,v in self._extra.items() }
+            extras = {k:str(v) for k,v in self._extra.items()}
             extras.update({
                 k:str(v) for k,v in record.__dict__.items()
             })

systemd/test/test_daemon.py

@@ -243,12 +243,12 @@ def test_listen_fds_default_unset():
     assert listen_fds() == []
 
 def test_notify_no_socket():
-    assert notify('READY=1') == False
+    assert notify('READY=1') is False
     with skip_enosys():
-        assert notify('FDSTORE=1', fds=[]) == False
-    assert notify('FDSTORE=1', fds=[1,2]) == False
-    assert notify('FDSTORE=1', pid=os.getpid()) == False
-    assert notify('FDSTORE=1', pid=os.getpid(), fds=(1,)) == False
+        assert notify('FDSTORE=1', fds=[]) is False
+    assert notify('FDSTORE=1', fds=[1, 2]) is False
+    assert notify('FDSTORE=1', pid=os.getpid()) is False
+    assert notify('FDSTORE=1', pid=os.getpid(), fds=(1,)) is False
 
 if sys.version_info >= (3,):
     connection_error = ConnectionRefusedError
@@ -264,7 +264,7 @@ def test_notify_bad_socket():
         with skip_enosys():
             notify('FDSTORE=1', fds=[])
     with pytest.raises(connection_error):
-        notify('FDSTORE=1', fds=[1,2])
+        notify('FDSTORE=1', fds=[1, 2])
     with pytest.raises(connection_error):
         notify('FDSTORE=1', pid=os.getpid())
     with pytest.raises(connection_error):
@@ -282,9 +282,9 @@ def test_notify_with_socket(tmpdir):
     sock.setsockopt(socket.SOL_SOCKET, SO_PASSCRED, 1)
     os.environ['NOTIFY_SOCKET'] = path
 
-    assert notify('READY=1') == True
+    assert notify('READY=1')
     with skip_enosys():
-        assert notify('FDSTORE=1', fds=[]) == True
-    assert notify('FDSTORE=1', fds=[1,2]) == True
-    assert notify('FDSTORE=1', pid=os.getpid()) == True
-    assert notify('FDSTORE=1', pid=os.getpid(), fds=(1,)) == True
+        assert notify('FDSTORE=1', fds=[])
+    assert notify('FDSTORE=1', fds=[1, 2])
+    assert notify('FDSTORE=1', pid=os.getpid())
+    assert notify('FDSTORE=1', pid=os.getpid(), fds=(1,))

systemd/test/test_journal.py

@@ -194,14 +194,14 @@ def test_reader_has_runtime_files(tmpdir):
     with j:
         with skip_oserror(errno.ENOSYS):
             ans = j.has_runtime_files()
-    assert ans == False
+    assert ans is False
 
 def test_reader_has_persistent_files(tmpdir):
     j = journal.Reader(path=tmpdir.strpath)
     with j:
         with skip_oserror(errno.ENOSYS):
             ans = j.has_runtime_files()
-    assert ans == False
+    assert ans is False
 
 def test_reader_converters(tmpdir):
     converters = {'xxx' : lambda arg: 'yyy'}

systemd/test/test_login.py

@@ -0,0 +1,48 @@
+from __future__ import print_function
+import select
+import contextlib
+import errno
+
+from systemd import login
+
+import pytest
+
+@contextlib.contextmanager
+def skip_oserror(code):
+    try:
+        yield
+    except (OSError, IOError) as e:
+        if e.errno == code:
+            pytest.skip()
+        raise
+
+def test_seats():
+    # just check that we get some sequence back
+    with skip_oserror(errno.ENOENT):
+        seats = login.seats()
+        assert len(seats) >= 0
+
+def test_sessions():
+    with skip_oserror(errno.ENOENT):
+        sessions = login.sessions()
+        assert len(sessions) >= 0
+
+def test_machine_names():
+    with skip_oserror(errno.ENOENT):
+        machine_names = login.machine_names()
+        assert len(machine_names) >= 0
+
+def test_uids():
+    with skip_oserror(errno.ENOENT):
+        uids = login.uids()
+        assert len(uids) >= 0
+
+def test_monitor():
+    p = select.poll()
+
+    with skip_oserror(errno.ENOENT):
+        m = login.Monitor("machine")
+        p.register(m, m.get_events())
+        login.machine_names()
+        p.poll(1)
+        login.machine_names()