openstack
/
python-novaclient
Code Issues Proposed changes

missed a conflict

This commit is contained in:
Jesse Andrews 2011-08-10 11:56:50 -07:00
parent 2e59567f97
commit 5f64a85114
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/v1_1/fakes.py
View File

@ -31,13 +31,8 @@ class FakeHTTPClient(base_client.HTTPClient):
assert 'body' in kwargs
# Call the method
<<<<<<< HEAD
munged_url = url.strip('/').replace('/', '_') \
.replace('.', '_').replace('-', '_')
=======
munged_url = url.strip('/').replace('/', '_').replace('.', '_')
munged_url = munged_url.replace('-', '_')
>>>>>>> rax/master
callback = "%s_%s" % (method.lower(), munged_url)
if not hasattr(self, callback):
raise AssertionError('Called unknown API method: %s %s' % (method,