summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-02-26 16:50:36 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-26 16:50:36 +0000
commit00182139afbfa67541340d46e49d948d1f69840c (patch)
tree889fd1d43b98d94eb09498ed8675d2331d6a3264
parent0f32796cae2aec6f778758f377ca76ffac1c8215 (diff)
parentd262b55a1e29b1202cd584f859d2d221d9addb8c (diff)
Merge "Stop raising keystoneauth1 exceptions in odl unit tests"
-rw-r--r--functest/tests/unit/odl/test_odl.py3
-rw-r--r--requirements.txt1
2 files changed, 1 insertions, 3 deletions
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index c11948bb9..aa31703b8 100644
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -13,7 +13,6 @@ import logging
import os
import unittest
-from keystoneauth1.exceptions import auth_plugins
import mock
from robot.errors import RobotError
import six
@@ -331,7 +330,7 @@ class ODLRunTesting(ODLTesting):
def test_exc(self):
with mock.patch('snaps.openstack.utils.keystone_utils.get_endpoint',
- side_effect=auth_plugins.MissingAuthPlugin()):
+ side_effect=Exception()):
self.assertEqual(self.test.run(),
testcase.TestCase.EX_RUN_ERROR)
diff --git a/requirements.txt b/requirements.txt
index a8b52739a..86d4b9a00 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,6 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0
PyYAML>=3.10.0 # MIT
GitPython>=1.0.1 # BSD License (3 clause)
-keystoneauth1>=3.1.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0
robotframework>=3.0
scp