← Back to branch summary

~ubuntu-branches/ubuntu/vivid/neutron/vivid-updates

« back to all changes in this revision

Viewing changes to neutron/tests/unit/test_neutron_context.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-03-30 11:17:19 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20150330111719-h0gx7233p4jkkgfh
Tags: 1:2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1263539
* New upstream milestone release:
  - d/control: Align version requirements with upstream.
  - d/control: Add new dependency on oslo-log.
  - d/p/*: Rebase.
  - d/control,d/neutron-plugin-hyperv*: Dropped, decomposed into
    separate project upstream.
  - d/control,d/neutron-plugin-openflow*: Dropped, decomposed into
    separate project upstream.
  - d/neutron-common.install: Add neutron-rootwrap-daemon and 
    neutron-keepalived-state-change binaries.
  - d/rules: Ignore neutron-hyperv-agent when installing; only for Windows.
  - d/neutron-plugin-cisco.install: Drop neutron-cisco-cfg-agent as
    decomposed into separate project upstream.
  - d/neutron-plugin-vmware.install: Drop neutron-check-nsx-config and
    neutron-nsx-manage as decomposed into separate project upstream.
  - d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent.
* d/pydist-overrides: Add overrides for oslo packages.
* d/control: Fixup type in package description (LP: #1263539).
* d/p/fixup-driver-test-execution.patch: Cherry pick fix from upstream VCS
  to support unit test exection in out-of-tree vendor drivers.
* d/neutron-common.postinst: Allow general access to /etc/neutron but limit
  access to root/neutron to /etc/neutron/neutron.conf to support execution
  of unit tests in decomposed vendor drivers.
* d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent
  package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/tests/unit/test_neutron_context.py
14
14
#    under the License.
15
15
 
16
16
import mock
 
17
from oslo_context import context as oslo_context
17
18
from testtools import matchers
18
19
 
19
20
from neutron import context
20
 
from neutron.openstack.common import local
21
21
from neutron.tests import base
22
22
 
23
23
 
129
129
 
130
130
    def test_neutron_context_overwrite(self):
131
131
        ctx1 = context.Context('user_id', 'tenant_id')
132
 
        self.assertEqual(ctx1.request_id, local.store.context.request_id)
 
132
        self.assertEqual(ctx1.request_id,
 
133
                         oslo_context.get_current().request_id)
133
134
 
134
135
        # If overwrite is not specified, request_id should be updated.
135
136
        ctx2 = context.Context('user_id', 'tenant_id')
136
137
        self.assertNotEqual(ctx2.request_id, ctx1.request_id)
137
 
        self.assertEqual(ctx2.request_id, local.store.context.request_id)
 
138
        self.assertEqual(ctx2.request_id,
 
139
                         oslo_context.get_current().request_id)
138
140
 
139
141
        # If overwrite is specified, request_id should be kept.
140
142
        ctx3 = context.Context('user_id', 'tenant_id', overwrite=False)
141
143
        self.assertNotEqual(ctx3.request_id, ctx2.request_id)
142
 
        self.assertEqual(ctx2.request_id, local.store.context.request_id)
 
144
        self.assertEqual(ctx2.request_id,
 
145
                         oslo_context.get_current().request_id)
143
146
 
144
147
    def test_neutron_context_get_admin_context_not_update_local_store(self):
145
148
        ctx = context.Context('user_id', 'tenant_id')
146
 
        req_id_before = local.store.context.request_id
 
149
        req_id_before = oslo_context.get_current().request_id
147
150
        self.assertEqual(ctx.request_id, req_id_before)
148
151
 
149
152
        ctx_admin = context.get_admin_context()
150
 
        self.assertEqual(req_id_before, local.store.context.request_id)
 
153
        self.assertEqual(req_id_before, oslo_context.get_current().request_id)
151
154
        self.assertNotEqual(req_id_before, ctx_admin.request_id)