434af1132c
FakeClient.assert_called() compares dictionaries of actual and body in a wrong way. It takes into account only top-level keys of the dict, leaving behind everything else. Changes to the test_shell.py file fix tests which had wrong expected values. Before this change expected values were not used properly, that's why the tests were passing. Closes-Bug: #1734115 Change-Id: Ib863c60a4698cbae01654bd8eea159b04d531569
88 lines
2.9 KiB
Python
88 lines
2.9 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(dictonary, required=None, optional=None):
|
|
if required is None:
|
|
required = []
|
|
if optional is None:
|
|
optional = []
|
|
for k in required:
|
|
try:
|
|
assert k in dictonary
|
|
except AssertionError:
|
|
extra_keys = set(dictonary).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:
|
|
actual = self.client.callstack[pos][2]
|
|
assert actual == body, "Expected %s; got %s" % (body, actual)
|
|
|
|
def assert_called_anytime(self, method, url, body=None,
|
|
clear_callstack=True):
|
|
"""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
|
|
if clear_callstack:
|
|
self.client.callstack = []
|
|
|
|
def clear_callstack(self):
|
|
self.client.callstack = []
|
|
|
|
def authenticate(self):
|
|
pass
|