41cf3f193b
This modification addresses Bug #1210292, specifically addressing the case where the test framework callstack is cleared when no asserts are raised in assert_called_anytime. This test method verifies that a specific API method call was made at any time during a test. If a test makes multiple calls to this method, and the first call yields no assertions, the subsequent calls will fail because the first assert in the method verifies that the callstack is non-empty. The error itself likely exists because assert_called_anytime is not currently used in the python-cinderclient testing framework. The fix involves deleting the last line in the method that clears the callstack. Fixes: bug 1210292 Change-Id: I8b7b740957841a328b2f0ca888190f758cbdd234
86 lines
2.7 KiB
Python
86 lines
2.7 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
"""
|
|
A fake server that "responds" to API methods with pre-canned responses.
|
|
|
|
All of these responses come from the spec, so if for some reason the spec's
|
|
wrong the tests might raise AssertionError. I've indicated in comments the
|
|
places where actual behavior differs from the spec.
|
|
"""
|
|
|
|
from __future__ import print_function
|
|
|
|
|
|
def assert_has_keys(dict, required=[], optional=[]):
|
|
keys = list(dict.keys())
|
|
for k in required:
|
|
try:
|
|
assert k in keys
|
|
except AssertionError:
|
|
extra_keys = set(keys).difference(set(required + optional))
|
|
raise AssertionError("found unexpected keys: %s" %
|
|
list(extra_keys))
|
|
|
|
|
|
class FakeClient(object):
|
|
|
|
def assert_called(self, method, url, body=None, pos=-1, **kwargs):
|
|
"""
|
|
Assert than an API method was just called.
|
|
"""
|
|
expected = (method, url)
|
|
called = self.client.callstack[pos][0:2]
|
|
|
|
assert self.client.callstack, ("Expected %s %s but no calls "
|
|
"were made." % expected)
|
|
|
|
assert expected == called, 'Expected %s %s; got %s %s' % (
|
|
expected + called)
|
|
|
|
if body is not None:
|
|
assert self.client.callstack[pos][2] == body
|
|
|
|
def assert_called_anytime(self, method, url, body=None):
|
|
"""
|
|
Assert than an API method was called anytime in the test.
|
|
"""
|
|
expected = (method, url)
|
|
|
|
assert self.client.callstack, ("Expected %s %s but no calls "
|
|
"were made." % expected)
|
|
|
|
found = False
|
|
for entry in self.client.callstack:
|
|
if expected == entry[0:2]:
|
|
found = True
|
|
break
|
|
|
|
assert found, 'Expected %s %s; got %s' % (
|
|
expected, self.client.callstack)
|
|
|
|
if body is not None:
|
|
try:
|
|
assert entry[2] == body
|
|
except AssertionError:
|
|
print(entry[2])
|
|
print("!=")
|
|
print(body)
|
|
raise
|
|
|
|
def clear_callstack(self):
|
|
self.client.callstack = []
|
|
|
|
def authenticate(self):
|
|
pass
|