openstack/deb-python-oslo.db
Code Issues Proposed changes

Remove moxstubout.py from oslo.db

Browse Source 
Remove moxstubout.py from common/fixture becouse it is
duplicated in oslotest

Change-Id: I6480c24a1b6f9d01af918d416ca14439cff31db0
This commit is contained in:
Oleksii Chuprykov 2014-07-17 16:09:46 +03:00
parent 44bd28704c
commit f96deb870b
4 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack-common.conf
View File

@ -2,7 +2,6 @@
# The list of modules to copy from oslo-incubator.git
module=gettextutils
module=fixture.moxstubout
module=importutils
module=fixture.config
module=timeutils

43
oslo/db/openstack/common/fixture/moxstubout.py
View File

@ -1,43 +0,0 @@
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# Copyright 2013 Hewlett-Packard Development Company, L.P.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
##############################################################################
##############################################################################
##
## DO NOT MODIFY THIS FILE
##
## This file is being graduated to the oslo.dbtest library. Please make all
## changes there, and only backport critical fixes here. - dhellmann
##
##############################################################################
##############################################################################
import fixtures
from six.moves import mox
class MoxStubout(fixtures.Fixture):
"""Deal with code around mox and stubout as a fixture."""
def setUp(self):
super(MoxStubout, self).setUp()
# emulate some of the mox stuff, we can't use the metaclass
# because it screws with our generators
self.mox = mox.Mox()
self.stubs = self.mox.stubs
self.addCleanup(self.mox.UnsetStubs)
self.addCleanup(self.mox.VerifyAll)

2
tests/sqlalchemy/test_utils.py
View File

@ -20,6 +20,7 @@ import warnings
from migrate.changeset import UniqueConstraint
import mock
from oslotest import base as test_base
from oslotest import moxstubout
import six
from six import moves
from six.moves.urllib import parse
@ -34,7 +35,6 @@ from sqlalchemy.sql import select
from sqlalchemy.types import UserDefinedType, NullType
from oslo.db import exception
from oslo.db.openstack.common.fixture import moxstubout
from oslo.db.sqlalchemy import models
from oslo.db.sqlalchemy import session
from oslo.db.sqlalchemy import test_base as db_test_base

3
tests/utils.py
View File

@ -15,8 +15,7 @@
from oslo.config import cfg
from oslotest import base as test_base
from oslo.db.openstack.common.fixture import moxstubout
from oslotest import moxstubout
class BaseTestCase(test_base.BaseTestCase):