openstack/storlets
Code Issues Proposed changes

Merge "Avoid broken http header including white space"

Browse Source
This commit is contained in:
Zuul 2019-11-15 09:10:42 +00:00 committed by Gerrit Code Review
commit 583d126bb4
2 changed files with 3 additions and 6 deletions
StorletSamples/java/IdentityStorlet/src/org/openstack/storlet/identity
IdentityStorlet.java
tests/functional/java
test_identity_storlet.py

2
StorletSamples/java/IdentityStorlet/src/org/openstack/storlet/identity/IdentityStorlet.java

@ -129,7 +129,7 @@ public class IdentityStorlet implements IStorlet {
* add execution invocation result to out md
*/
if (bExecute == true) {
md.put("Execution result", Integer.toString(nExitCode));
md.put("Execution-Result", Integer.toString(nExitCode));
}
/*
* Copy parameters into out md

7
tests/functional/java/test_identity_storlet.py

@ -16,7 +16,6 @@
import os
import random
import six
import string
from swiftclient import client as c
from nose.plugins.attrib import attr
@ -75,7 +74,7 @@ class TestIdentityStorlet(StorletJavaFunctionalTest):
processed_c += chunk
if params is not None and params.get('execute', None) is not None:
mdv = processed_h['X-Object-Meta-Execution result'.lower()]
mdv = processed_h['X-Object-Meta-Execution-Result'.lower()]
self.assertEqual('42', mdv)
if params is not None and params.get('double', None) == 'true':
self.assertEqual(original_c, processed_c[:file_length])
@ -112,7 +111,7 @@ class TestIdentityStorlet(StorletJavaFunctionalTest):
assert(uploaded_c == saved_c)
if params is not None and params.get('execute', None) is not None:
mdv = resp_headers['X-Object-Meta-Execution result'.lower()]
mdv = resp_headers['X-Object-Meta-Execution-Result'.lower()]
self.assertEqual('42', mdv)
self.assertEqual(random_md,
@ -153,7 +152,6 @@ class TestIdentityStorlet(StorletJavaFunctionalTest):
def test_put(self):
self.invoke_storlet('PUT')
@unittest.skipIf(six.PY3, 'execute can hang on py3 for some reason')
def test_put_execute(self):
self.invoke_storlet('PUT', {'execute': 'true'})
self.invoke_storlet('PUT', {'execute': 'true'},
@ -172,7 +170,6 @@ class TestIdentityStorlet(StorletJavaFunctionalTest):
self.invoke_storlet('GET', {'double': 'true'},
header_parameters=True)
@unittest.skipIf(six.PY3, 'execute can hang on py3 for some reason')
def test_get_execute(self):
self.invoke_storlet('GET', {'execute': 'true'})
self.invoke_storlet('GET', {'execute': 'true'},