fixup test_orm with new User wrapper

user.db is evaluated immediately, rather than on first request,
which means we can't do User(orm.User) before adding the orm.User to the db

jupyterhub/tests/test_orm.py

@@ -42,9 +42,10 @@ def test_server(db):
 
 
 def test_user(db):
-    user = User(orm.User(name='kaylee'))
+    orm_user = orm.User(name='kaylee')
-    db.add(user)
+    db.add(orm_user)
     db.commit()
+    user = User(orm_user)
     spawner = user.spawners['']
     spawner.orm_spawner.state = {'pid': 4234}
     assert user.name == 'kaylee'
@@ -194,9 +195,10 @@ def test_groups(db):
 
 @pytest.mark.gen_test
 def test_auth_state(db):
-    user = User(orm.User(name='eve'))
+    orm_user = orm.User(name='eve')
-    db.add(user.orm_user)
+    db.add(orm_user)
     db.commit()
+    user = User(orm_user)
 
     ck = crypto.CryptKeeper.instance()
 

jupyterhub/user.py

@@ -136,13 +136,10 @@ class User:
     log = app_log
     settings = None
 
-    def __init__(self, orm_user, settings=None, **kwargs):
+    def __init__(self, orm_user, settings=None, db=None):
-        self.orm_user = orm_user
+        self.db = db or inspect(orm_user).session
-        self.db = inspect(orm_user).session
         self.settings = settings or {}
-        for key, attr in kwargs:
+        self.orm_user = orm_user
-            print('setting', key, attr)
-            setattr(self, key, attr)
 
 
         self.allow_named_servers = self.settings.get('allow_named_servers', False)