378a06195d
This patch moves much of the Java build stuff from the topmost build.xml file that woulds eventually get replaced with setup.py In addition we push down the java storlets tests and implementation down the tree, to comply with the python structure. During merge with python code, added intermediate test classes one for Python and one for Java that hide some details Finally, we cleanup some old unused files under tests Bonus: - Fix the Ansible behind "ant deploy_container_agent" - Fix what seems to be a bug in the daemog factory that considers ECHILD as unknown error Change-Id: Ib503b529719e6a877fd0b1df24597f47cf471192
118 lines
4.1 KiB
Python
118 lines
4.1 KiB
Python
'''-------------------------------------------------------------------------
|
|
Copyright IBM Corp. 2015, 2015 All Rights Reserved
|
|
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.
|
|
-------------------------------------------------------------------------'''
|
|
|
|
import threading
|
|
from swiftclient import client as c
|
|
from nose.plugins.attrib import attr
|
|
from tests.functional.java import StorletJavaFunctionalTest
|
|
|
|
|
|
class myTestThread (threading.Thread):
|
|
def __init__(self, url, token, test_class):
|
|
threading.Thread.__init__(self)
|
|
self.token = token
|
|
self.url = url
|
|
self.test_class = test_class
|
|
|
|
def run(self):
|
|
self.test_class.invokeTestStorlet("print", False)
|
|
|
|
|
|
class TestTestStorlet(StorletJavaFunctionalTest):
|
|
def setUp(self):
|
|
self.storlet_log = ''
|
|
self.additional_headers = {}
|
|
main_class = 'org.openstack.storlet.test.test1'
|
|
super(TestTestStorlet, self).setUp('TestStorlet',
|
|
'test-10.jar',
|
|
main_class,
|
|
'myobjects',
|
|
'')
|
|
|
|
c.put_object(self.url,
|
|
self.token,
|
|
self.container,
|
|
'test_object',
|
|
'some content')
|
|
|
|
def invokeTestStorlet(self, op, withlog=False):
|
|
headers = {'X-Run-Storlet': self.storlet_name}
|
|
headers.update(self.additional_headers)
|
|
if withlog is True:
|
|
headers['X-Storlet-Generate-Log'] = 'True'
|
|
|
|
params = 'op={0}¶m2=val2'.format(op)
|
|
resp_dict = dict()
|
|
try:
|
|
resp_headers, gf = c.get_object(self.url, self.token, 'myobjects',
|
|
'test_object', None, None, params,
|
|
resp_dict, headers)
|
|
get_text = gf
|
|
get_response_status = resp_dict.get('status')
|
|
|
|
if withlog is True:
|
|
resp_headers, gf = c.get_object(self.url, self.token,
|
|
'storletlog', 'test.log',
|
|
None, None, None, None,
|
|
headers)
|
|
self.assertEqual(resp_headers.get('status'), 200)
|
|
gf.read()
|
|
self.assertEqual(resp_headers.get('status') == 200)
|
|
|
|
if op == 'print':
|
|
self.assertEqual(get_response_status, 200)
|
|
self.assertIn('op', get_text)
|
|
self.assertIn('print', get_text)
|
|
self.assertIn('param2', get_text)
|
|
self.assertIn('val2', get_text)
|
|
|
|
except Exception:
|
|
get_response_status = resp_dict.get('status')
|
|
if op == 'crash':
|
|
self.assertTrue(get_response_status >= 500 or
|
|
get_response_status == 404)
|
|
|
|
def test_print(self):
|
|
self.invokeTestStorlet("print", False)
|
|
|
|
def test_crash(self):
|
|
self.invokeTestStorlet("crash")
|
|
|
|
@attr('slow')
|
|
def test_hold(self):
|
|
self.invokeTestStorlet("hold")
|
|
|
|
def invokeTestStorletinParallel(self):
|
|
mythreads = []
|
|
|
|
for i in range(10):
|
|
new_thread = myTestThread(self.url, self.token, self)
|
|
mythreads.append(new_thread)
|
|
|
|
for t in mythreads:
|
|
t.start()
|
|
|
|
for t in mythreads:
|
|
t.join()
|
|
|
|
def test_parallel_print(self):
|
|
self.invokeTestStorletinParallel()
|
|
|
|
|
|
class TestTestStorletOnProxy(TestTestStorlet):
|
|
def setUp(self):
|
|
super(TestTestStorletOnProxy, self).setUp()
|
|
self.additional_headers = {'X-Storlet-Run-On-Proxy': ''}
|