jupyterhub
diff --git a/‎jupyterhub/tests/test_eventlog.py‎
Lines changed: 48 additions & 5 deletions b/‎jupyterhub/tests/test_eventlog.py‎
Lines changed: 48 additions & 5 deletions
@@ -14,7 +14,11 @@
 import pytest
 from traitlets.config import Config
 
+from .. import orm
 from .mocking import MockHub
+from .utils import add_user
+from .utils import api_request
+from jupyterhub.utils import eventlogging_schema_fqn
 
 
 # To test new schemas, add them to the `valid_events`
@@ -24,7 +28,7 @@
 # { ( '<schema id>', <version> ) : { <event_data> } }
 valid_events = [
     (
- 'hub.jupyter.org/server-action',
+ eventlogging_schema_fqn('server-action'),
  1,
  dict(action='start', username='test-username', servername='test-servername'),
     )
@@ -34,7 +38,7 @@
 # { ( '<schema id>', <version> ) : { <event_data> } }
 invalid_events = [
  # Missing required keys
-    ('hub.jupyter.org/server-action', 1, dict(action='start'))
+    (eventlogging_schema_fqn('server-action'), 1, dict(action='start'))
 ]
 
 
@@ -50,15 +54,17 @@ def eventlog_sink(app):
  with mock.patch.object(app.config, 'EventLog', cfg.EventLog):
  # recreate the eventlog object with our config
  app.init_eventlog()
+ app.tornado_settings['eventlog'] = app.eventlog
  # return the sink from the fixture
- yield app.eventlog, sink
+ yield app, sink
  # reset eventlog with original config
  app.init_eventlog()
 
 
 @pytest.mark.parametrize('schema, version, event', valid_events)
 def test_valid_events(eventlog_sink, schema, version, event):
- eventlog, sink = eventlog_sink
+ app, sink = eventlog_sink
+ eventlog = app.eventlog
  eventlog.allowed_schemas = [schema]
  # Record event
  eventlog.record_event(schema, version, event)
@@ -72,9 +78,46 @@ def test_valid_events(eventlog_sink, schema, version, event):
 
 @pytest.mark.parametrize('schema, version, event', invalid_events)
 def test_invalid_events(eventlog_sink, schema, version, event):
- eventlog, sink = eventlog_sink
+ app, sink = eventlog_sink
+ eventlog = app.eventlog
  eventlog.allowed_schemas = [schema]
 
  # Make sure an error is thrown when bad events are recorded
  with pytest.raises(jsonschema.ValidationError):
  recorded_event = eventlog.record_event(schema, version, event)
+
+
+def remove_event_capsule(data):
+ return {
+ k: v for k, v in data.items() if not (k.startswith('__') and k.endswith('__'))
+    }
+
+
+async def test_server_event(eventlog_sink):
+ schema, version = (eventlogging_schema_fqn('server-action'), 1)
+
+ app, sink = eventlog_sink
+ app.eventlog.allowed_schemas = [schema]
+
+ db = app.db
+ name = 'user'
+ user = add_user(db, app=app, name=name)
+
+ # test user server starting event
+ r = await api_request(app, 'users', name, 'server', method='post')
+ output = sink.getvalue()
+ assert output
+ data = remove_event_capsule(json.loads(output))
+ jsonschema.validate(data, app.eventlog.schemas[(schema, version)])
+ expected = {'action': 'start', 'username': name}
+ assert expected.items() <= data.items()
+
+ # test user server stopping event
+ r = await api_request(app, 'users', name, 'server', method='delete')
+ offset = len(output)
+ output = sink.getvalue()[offset:]
+ assert output
+ data = remove_event_capsule(json.loads(output))
+ jsonschema.validate(data, app.eventlog.schemas[(schema, version)])
+ expected = {'action': 'stop', 'username': name}
+ assert expected.items() <= data.items()