openstack
/
sahara
Code Issues Proposed changes

Merge "[IT] More coverage of EDP in tests"

This commit is contained in:
Jenkins 2014-04-29 17:52:30 +00:00 committed by Gerrit Code Review
parent 32a2558025 b096c45dcf
commit fd97c8fea7
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sahara/tests/integration/tests/gating/test_vanilla_gating.py
View File

@ -19,7 +19,6 @@ from sahara.openstack.common import excutils
from sahara.tests.integration.configs import config as cfg
from sahara.tests.integration.tests import cinder
from sahara.tests.integration.tests import cluster_configs
from sahara.tests.integration.tests import edp
from sahara.tests.integration.tests import map_reduce
from sahara.tests.integration.tests import scaling
from sahara.tests.integration.tests import swift
@ -28,7 +27,7 @@ from sahara.utils import edp as utils_edp
class VanillaGatingTest(cinder.CinderVolumeTest,
cluster_configs.ClusterConfigTest, edp.EDPTest,
cluster_configs.ClusterConfigTest,
map_reduce.MapReduceTest, swift.SwiftTest,
scaling.ScalingTest,
vanilla_transient_cluster.TransientClusterTest):

24
sahara/tests/integration/tests/vanilla_transient_cluster.py
View File

@ -19,9 +19,11 @@ import saharaclient.api.base as sab
from sahara.openstack.common import timeutils
from sahara.tests.integration.tests import base
from sahara.tests.integration.tests import edp
from sahara.utils import edp as utils_edp
class TransientClusterTest(base.ITestCase):
class TransientClusterTest(edp.EDPTest):
@base.skip_test(
'SKIP_TRANSIENT_CLUSTER_TEST',
message='Test for transient cluster was skipped.')
@ -35,9 +37,15 @@ class TransientClusterTest(base.ITestCase):
cluster_configs={},
node_groups=[
dict(
name='single-node',
name='master-node',
flavor_id=self.flavor_id,
node_processes=['namenode'],
node_processes=['namenode', 'oozie', 'jobtracker'],
floating_ip_pool=floating_ip_pool,
count=1),
dict(
name='worker-node',
flavor_id=self.flavor_id,
node_processes=['datanode', 'tasktracker'],
floating_ip_pool=floating_ip_pool,
count=1)
],
@ -45,6 +53,7 @@ class TransientClusterTest(base.ITestCase):
)
try:
# create a transient cluster
try:
cluster_name = (self.common_config.CLUSTER_NAME + '-transient-'
+ plugin_config.PLUGIN_NAME)
@ -60,12 +69,21 @@ class TransientClusterTest(base.ITestCase):
self.delete_objects(cluster_id=self.cluster_id)
raise
# check EDP
path = 'sahara/tests/integration/tests/resources/'
pig_job_data = open(path + 'edp-job.pig').read()
pig_lib_data = open(path + 'edp-lib.jar').read()
self.edp_testing(job_type=utils_edp.JOB_TYPE_PIG,
job_data_list=[{'pig': pig_job_data}],
lib_data_list=[{'jar': pig_lib_data}])
cluster_info = self.get_cluster_info(plugin_config)
# set timeout in seconds
timeout = self.common_config.TRANSIENT_CLUSTER_TIMEOUT * 60
s_time = timeutils.utcnow()
raise_failure = True
# wait for cluster deleting
while timeutils.delta_seconds(
s_time, timeutils.utcnow()) < timeout:
try: