summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-07 14:18:14 +0000
committerGerrit Code Review <review@openstack.org>2018-06-07 14:18:15 +0000
commit7df2d5978005c1a4af33067e77ecd945b38ab13a (patch)
treefa8718bb050ef09a7ba258905e75c8127c190193
parent2c275b08c5edfd226b79a2b4427245fafac4bb50 (diff)
parent56797cc88b481929e13585a51d4d350e9e50472c (diff)
downloadpycadf-7df2d5978005c1a4af33067e77ecd945b38ab13a.tar.gz
Merge "Remove moxstubout usage"rocky-em2.8.0
-rw-r--r--pycadf/tests/base.py4
-rw-r--r--test-requirements.txt2
2 files changed, 1 insertions, 5 deletions
diff --git a/pycadf/tests/base.py b/pycadf/tests/base.py
index d09bdd6..2e9bc42 100644
--- a/pycadf/tests/base.py
+++ b/pycadf/tests/base.py
@@ -18,7 +18,6 @@ import os.path
import fixtures
from oslo_config import cfg
-from oslotest import moxstubout
import testtools
@@ -27,9 +26,6 @@ class TestCase(testtools.TestCase):
def setUp(self):
super(TestCase, self).setUp()
self.tempdir = self.useFixture(fixtures.TempDir())
- moxfixture = self.useFixture(moxstubout.MoxStubout())
- self.mox = moxfixture.mox
- self.stubs = moxfixture.stubs
cfg.CONF([], project='pycadf')
def path_get(self, project_file=None):
diff --git a/test-requirements.txt b/test-requirements.txt
index b31ff63..c3711fc 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,8 +7,8 @@ flake8-docstrings==0.2.1.post1 # MIT
coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
-oslotest>=3.2.0 # Apache-2.0
python-subunit>=1.0.0 # Apache-2.0/BSD
+mock>=2.0.0 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=2.2.0 # MIT