Merge "Fix deprecation warnings about oslo.context"

neutron/tests/unit/test_auth.py

@@ -45,7 +45,6 @@ class NeutronKeystoneContextTestCase(base.BaseTestCase):
         response = self.request.get_response(self.middleware)
         self.assertEqual('200 OK', response.status)
         self.assertEqual('testuserid', self.context.user_id)
-        self.assertEqual('testuserid', self.context.user)
 
     def test_with_tenant_id(self):
         self.request.headers['X_PROJECT_ID'] = 'testtenantid'

neutron/tests/unit/test_policy.py

@@ -227,7 +227,7 @@ class PolicyTestCase(base.BaseTestCase):
         action = "get_example:only_project_user_allowed"
         target = {'project_id': 'some-project'}
         system_admin_ctx = context.Context(
-            user="fake",
+            user_id="fake",
             roles=['admin', 'member', 'reader'],
             system_scope='all')
         self.assertRaises(