From d915e82dfa72b256193f8f82ae9e4e4c559779ee Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Mon, 8 Aug 2016 09:55:22 +0300 Subject: [PATCH] Fix exception handling in DPDK tests HTTP client was replaced by keystoneauth1 session -> update test code Closes-bug: #1609705 Change-Id: Ia65afd72115d677321dd1ce674c8ad87e18d02b3 --- fuelweb_test/tests/test_dpdk.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/fuelweb_test/tests/test_dpdk.py b/fuelweb_test/tests/test_dpdk.py index 8bb44671e..5ef48db41 100644 --- a/fuelweb_test/tests/test_dpdk.py +++ b/fuelweb_test/tests/test_dpdk.py @@ -19,9 +19,7 @@ from devops.helpers import helpers as devops_helpers from proboscis.asserts import assert_raises from proboscis.asserts import assert_true from proboscis import test -# pylint: disable=import-error -from six.moves.urllib.error import HTTPError -# pylint: enable=import-error +from keystoneauth1 import exceptions from fuelweb_test.helpers.decorators import log_snapshot_after_test from fuelweb_test.helpers import os_actions @@ -281,7 +279,10 @@ class SupportDPDK(TestDPDK): self.setup_hugepages(compute, hp_2mb=256, hp_dpdk_mb=128) self.show_step(5) - assert_raises(HTTPError, self.enable_dpdk, compute, forceEnable=True) + assert_raises( + exceptions.BadRequest, + self.enable_dpdk, compute, + forceEnable=True) @test(depends_on=[SetupEnvironment.prepare_slaves_3], groups=["check_can_not_enable_dpdk_on_non_dedicated_iface"]) @@ -335,7 +336,10 @@ class SupportDPDK(TestDPDK): } self.fuel_web.update_node_networks(compute['id'], interfaces_dict=assigned_networks) - assert_raises(HTTPError, self.enable_dpdk, compute, forceEnable=True) + assert_raises( + exceptions.BadRequest, + self.enable_dpdk, compute, + forceEnable=True) @test(groups=["support_dpdk_bond"])