Merge "Python2: Add mock and unittest2 test dependencies"
This commit is contained in:
commit
44cab87d5f
|
@ -0,0 +1,9 @@
|
||||||
|
try:
|
||||||
|
from unittest import mock # Python 3.3+
|
||||||
|
except ImportError:
|
||||||
|
import mock # noqa: Python 2.7
|
||||||
|
|
||||||
|
try:
|
||||||
|
import unittest2 as unittest # Python 2.7
|
||||||
|
except ImportError:
|
||||||
|
import unittest # noqa
|
|
@ -13,11 +13,11 @@ import time
|
||||||
from typing import Any
|
from typing import Any
|
||||||
from typing import Dict
|
from typing import Dict
|
||||||
from typing import Iterable
|
from typing import Iterable
|
||||||
import unittest
|
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
from ospurge import exceptions
|
from ospurge import exceptions
|
||||||
from ospurge.resources import base
|
from ospurge.resources import base
|
||||||
|
from ospurge.tests import mock
|
||||||
|
from ospurge.tests import unittest
|
||||||
|
|
||||||
|
|
||||||
def generate_timeout_series(timeout):
|
def generate_timeout_series(timeout):
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
import unittest
|
import unittest
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
import shade
|
import shade
|
||||||
|
|
||||||
from ospurge.resources import cinder
|
from ospurge.resources import cinder
|
||||||
|
from ospurge.tests import mock
|
||||||
|
|
||||||
|
|
||||||
class TestBackups(unittest.TestCase):
|
class TestBackups(unittest.TestCase):
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
import unittest
|
import unittest
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
import shade
|
import shade
|
||||||
|
|
||||||
from ospurge.resources import glance
|
from ospurge.resources import glance
|
||||||
|
from ospurge.tests import mock
|
||||||
|
|
||||||
|
|
||||||
class TestListImagesMixin(unittest.TestCase):
|
class TestListImagesMixin(unittest.TestCase):
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
import unittest
|
import unittest
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
import shade
|
import shade
|
||||||
|
|
||||||
from ospurge.resources import neutron
|
from ospurge.resources import neutron
|
||||||
|
from ospurge.tests import mock
|
||||||
|
|
||||||
|
|
||||||
class TestFloatingIPs(unittest.TestCase):
|
class TestFloatingIPs(unittest.TestCase):
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
import unittest
|
import unittest
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
import shade
|
import shade
|
||||||
|
|
||||||
from ospurge.resources import nova
|
from ospurge.resources import nova
|
||||||
|
from ospurge.tests import mock
|
||||||
|
|
||||||
|
|
||||||
class TestServers(unittest.TestCase):
|
class TestServers(unittest.TestCase):
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
import unittest
|
import unittest
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
import shade
|
import shade
|
||||||
|
|
||||||
from ospurge.resources import swift
|
from ospurge.resources import swift
|
||||||
|
from ospurge.tests import mock
|
||||||
|
|
||||||
|
|
||||||
class TestListObjectsMixin(unittest.TestCase):
|
class TestListObjectsMixin(unittest.TestCase):
|
||||||
|
|
|
@ -13,13 +13,13 @@ import argparse
|
||||||
import logging
|
import logging
|
||||||
import types
|
import types
|
||||||
import unittest
|
import unittest
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
import shade.exc
|
import shade.exc
|
||||||
|
|
||||||
from ospurge import exceptions
|
from ospurge import exceptions
|
||||||
from ospurge import main
|
from ospurge import main
|
||||||
from ospurge.resources.base import ServiceResource
|
from ospurge.resources.base import ServiceResource
|
||||||
|
from ospurge.tests import mock
|
||||||
from ospurge import utils
|
from ospurge import utils
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
import logging
|
import logging
|
||||||
import typing
|
import typing
|
||||||
import unittest
|
import unittest
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
import shade
|
import shade
|
||||||
|
|
||||||
from ospurge.resources.base import ServiceResource
|
from ospurge.resources.base import ServiceResource
|
||||||
|
from ospurge.tests import mock
|
||||||
from ospurge import utils
|
from ospurge import utils
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,3 +5,7 @@ hacking>=0.12.0,<0.13 # Apache-2.0
|
||||||
openstackdocstheme>=1.5.0 # Apache-2.0
|
openstackdocstheme>=1.5.0 # Apache-2.0
|
||||||
sphinx>=1.2.1,!=1.3b1,<1.4 # BSD
|
sphinx>=1.2.1,!=1.3b1,<1.4 # BSD
|
||||||
testrepository>=0.0.18 # Apache-2.0/BSD
|
testrepository>=0.0.18 # Apache-2.0/BSD
|
||||||
|
|
||||||
|
# Python 2.7 dependencies
|
||||||
|
mock; python_version < '3.0'
|
||||||
|
unittest2; python_version < '3.0'
|
||||||
|
|
Loading…
Reference in New Issue