merge to trunk
This commit is contained in:
commit
9e4be4a111
@ -58,7 +58,7 @@
|
||||
</div>
|
||||
<script type="text/javascript">$('#searchbox').show(0);</script>
|
||||
<p class="triangle-border right">
|
||||
Psst... hey. Did you know you can read <a href="http://swift.openstack.org/1.2">Swift 1.2 docs</a> or <a href="http://swift.openstack.org/1.1">Swift 1.1 docs</a> also?
|
||||
Psst... hey. Did you know you can read <a href="http://swift.openstack.org/1.3">Swift 1.3 docs</a> or <a href="http://swift.openstack.org/1.2">Swift 1.2 docs</a> also?
|
||||
</p>
|
||||
{%- endif %}
|
||||
|
||||
|
@ -58,7 +58,7 @@ Instructions for Building Debian Packages for Swift
|
||||
apt-get install python-software-properties
|
||||
add-apt-repository ppa:swift-core/ppa
|
||||
apt-get update
|
||||
apt-get install curl gcc bzr python-configobj python-coverage python-dev python-nose python-setuptools python-simplejson python-xattr python-webob python-eventlet python-greenlet debhelper python-sphinx python-all python-openssl python-pastedeploy bzr-builddeb
|
||||
apt-get install curl gcc bzr python-configobj python-coverage python-dev python-nose python-setuptools python-simplejson python-xattr python-webob python-eventlet python-greenlet debhelper python-sphinx python-all python-openssl python-pastedeploy python-netifaces bzr-builddeb
|
||||
|
||||
* As you
|
||||
|
||||
|
@ -426,7 +426,7 @@ class Swift3Middleware(object):
|
||||
self.app = app
|
||||
|
||||
def get_controller(self, path):
|
||||
container, obj = split_path(path, 0, 2)
|
||||
container, obj = split_path(path, 0, 2, True)
|
||||
d = dict(container_name=container, object_name=obj)
|
||||
|
||||
if container and obj:
|
||||
|
@ -207,16 +207,6 @@ class TestSwift3(unittest.TestCase):
|
||||
code = dom.getElementsByTagName('Code')[0].childNodes[0].nodeValue
|
||||
self.assertEquals(code, 'InvalidArgument')
|
||||
|
||||
def test_bad_path(self):
|
||||
req = Request.blank('/bucket/object/bad',
|
||||
environ={'REQUEST_METHOD': 'GET'},
|
||||
headers={'Authorization': 'AWS test:tester:hmac'})
|
||||
resp = self.app(req.environ, start_response)
|
||||
dom = xml.dom.minidom.parseString("".join(resp))
|
||||
self.assertEquals(dom.firstChild.nodeName, 'Error')
|
||||
code = dom.getElementsByTagName('Code')[0].childNodes[0].nodeValue
|
||||
self.assertEquals(code, 'InvalidURI')
|
||||
|
||||
def test_bad_method(self):
|
||||
req = Request.blank('/',
|
||||
environ={'REQUEST_METHOD': 'PUT'},
|
||||
|
Loading…
x
Reference in New Issue
Block a user