aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-02-26 11:31:48 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-02-26 11:33:43 +0100
commitd262b55a1e29b1202cd584f859d2d221d9addb8c (patch)
tree6bc2da8e036753600f61c5ae07bc2a46d408e665
parent9c8dbc5be69b856c45ba61c525e74a4826f6a5c7 (diff)
Stop raising keystoneauth1 exceptions in odl unit tests
It simply raises Exceptions to avoid depending on keystoneauth1. Snaps may also reraise another exception. Change-Id: Ib3041b2d8ff51ee098f2bf0b9918079b7945abf3 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-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 c11948bb..aa31703b 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 a8b52739..86d4b9a0 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