From: Zane Bitter Date: Tue, 18 Sep 2012 15:59:51 +0000 (+0200) Subject: Tag functional tests with the JEOS required X-Git-Tag: 2014.1~1382^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=66aa7c33692399c96834915b99ad805b99b7f670;p=openstack-build%2Fheat-build.git Tag functional tests with the JEOS required Change-Id: Ie0204d5382d402058b5538884d42512e724e94db Signed-off-by: Zane Bitter --- diff --git a/heat/tests/functional/test_CFN_API_Actions.py b/heat/tests/functional/test_CFN_API_Actions.py index cf4ba987..42ce50be 100644 --- a/heat/tests/functional/test_CFN_API_Actions.py +++ b/heat/tests/functional/test_CFN_API_Actions.py @@ -23,7 +23,7 @@ import json @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'api', 'cfn']) +@attr(tag=['func', 'wordpress', 'api', 'cfn', 'F17']) class CfnApiFunctionalTest(unittest.TestCase): ''' This test launches a wordpress stack then attempts to verify diff --git a/heat/tests/functional/test_HAProxy_Single_Instance.py b/heat/tests/functional/test_HAProxy_Single_Instance.py index 6a0cfcc2..b8d0a8f0 100644 --- a/heat/tests/functional/test_HAProxy_Single_Instance.py +++ b/heat/tests/functional/test_HAProxy_Single_Instance.py @@ -21,7 +21,8 @@ import os @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'haproxy', 'HAProxy_Single_Instance.template']) +@attr(tag=['func', 'wordpress', 'haproxy', 'F17', + 'HAProxy_Single_Instance.template']) class HAProxyFunctionalTest(unittest.TestCase): def setUp(self): # The HAProxy template somewhat un-usefully load-balances a single diff --git a/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py b/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py index bf06fb8a..f48fb149 100644 --- a/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py +++ b/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py @@ -21,7 +21,8 @@ import os @attr(speed='slow') -@attr(tag=['func', 'openshift', 'OpenShift_Prebuilt_JEOS.template']) +@attr(tag=['func', 'openshift', 'F16-openshift', + 'OpenShift_Prebuilt_JEOS.template']) class OpenShiftFunctionalTest(unittest.TestCase): def tearDown(self): diff --git a/heat/tests/functional/test_WordPress_2_Instances_With_EBS.py b/heat/tests/functional/test_WordPress_2_Instances_With_EBS.py index 8996dc18..ca877289 100644 --- a/heat/tests/functional/test_WordPress_2_Instances_With_EBS.py +++ b/heat/tests/functional/test_WordPress_2_Instances_With_EBS.py @@ -24,7 +24,7 @@ import os @attr(speed='slow') -@attr(tag=['func', 'wordpress', '2instance', 'ebs', +@attr(tag=['func', 'wordpress', '2instance', 'ebs', 'F17', 'WordPress_2_Instances_With_EBS.template']) class WordPress2InstancesWithEBS(unittest.TestCase): def setUp(self): diff --git a/heat/tests/functional/test_WordPress_2_Instances_With_EBS_EIP.py b/heat/tests/functional/test_WordPress_2_Instances_With_EBS_EIP.py index 0da6adcc..7b9e179d 100644 --- a/heat/tests/functional/test_WordPress_2_Instances_With_EBS_EIP.py +++ b/heat/tests/functional/test_WordPress_2_Instances_With_EBS_EIP.py @@ -21,7 +21,7 @@ import os @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'eip', 'ebs']) +@attr(tag=['func', 'wordpress', 'eip', 'ebs', 'F17']) class WordPress2EBSEIPFunctionalTest(unittest.TestCase): def setUp(self): template = 'WordPress_2_Instances_With_EBS_EIP.template' diff --git a/heat/tests/functional/test_WordPress_2_Intances.py b/heat/tests/functional/test_WordPress_2_Intances.py index d277c2e6..8cb716fb 100644 --- a/heat/tests/functional/test_WordPress_2_Intances.py +++ b/heat/tests/functional/test_WordPress_2_Intances.py @@ -24,7 +24,7 @@ import os @attr(speed='slow') -@attr(tag=['func', 'wordpress', '2instance', 'ebs', +@attr(tag=['func', 'wordpress', '2instance', 'ebs', 'F17', 'WordPress_2_Instances.template']) class WordPress2Instances(unittest.TestCase): def setUp(self): diff --git a/heat/tests/functional/test_WordPress_Composed_Instances.py b/heat/tests/functional/test_WordPress_Composed_Instances.py index 041eb089..1ba2e111 100644 --- a/heat/tests/functional/test_WordPress_Composed_Instances.py +++ b/heat/tests/functional/test_WordPress_Composed_Instances.py @@ -21,7 +21,7 @@ import os @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'composed', +@attr(tag=['func', 'wordpress', 'composed', 'F17', 'WordPress_Composed_Instances.template']) class WordPressComposedInstancesFunctionalTest(unittest.TestCase): def setUp(self): diff --git a/heat/tests/functional/test_WordPress_Single_Instance.py b/heat/tests/functional/test_WordPress_Single_Instance.py index d9384272..c82702d7 100644 --- a/heat/tests/functional/test_WordPress_Single_Instance.py +++ b/heat/tests/functional/test_WordPress_Single_Instance.py @@ -21,7 +21,7 @@ import os @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'WordPress_Single_Instance.template']) +@attr(tag=['func', 'wordpress', 'F17', 'WordPress_Single_Instance.template']) class WordPressFunctionalTest(unittest.TestCase): def setUp(self): template = 'WordPress_Single_Instance.template' diff --git a/heat/tests/functional/test_WordPress_Single_Instance_Boto.py b/heat/tests/functional/test_WordPress_Single_Instance_Boto.py index 1327e4dc..32124979 100644 --- a/heat/tests/functional/test_WordPress_Single_Instance_Boto.py +++ b/heat/tests/functional/test_WordPress_Single_Instance_Boto.py @@ -21,7 +21,8 @@ import os @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'WordPress_Single_Instance.template', 'boto']) +@attr(tag=['func', 'wordpress', 'F17', + 'WordPress_Single_Instance.template', 'boto']) class WordPressBotoFunctionalTest(unittest.TestCase): def setUp(self): template = 'WordPress_Single_Instance.template' diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS.py b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS.py index 79d67921..52318ddf 100644 --- a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS.py +++ b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS.py @@ -24,7 +24,7 @@ import os @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'ebs', +@attr(tag=['func', 'wordpress', 'ebs', 'F17', 'WordPress_Single_Instance_With_EBS.template']) class WordPressSingleEBSFunctionalTest(unittest.TestCase): def setUp(self): diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py index 1f6bb503..c61db81d 100644 --- a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py +++ b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py @@ -24,7 +24,7 @@ import os @attr(speed='slow') -@attr(tag=['func', 'WordPress_Single_Instance_With_EBS_EIP.template', +@attr(tag=['func', 'WordPress_Single_Instance_With_EBS_EIP.template', 'F17', 'wordpress', 'ebs', 'eip']) class WordPressEBSEIPFunctionalTest(unittest.TestCase): def setUp(self): diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py b/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py index 00a55d26..e6e18dc2 100644 --- a/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py +++ b/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py @@ -24,7 +24,7 @@ import os @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'eip', +@attr(tag=['func', 'wordpress', 'eip', 'F17', 'WordPress_Single_Instance_With_EIP.template']) class WordPressEIPFunctionalTest(unittest.TestCase): def setUp(self): diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_HA.py b/heat/tests/functional/test_WordPress_Single_Instance_With_HA.py index 408c52d8..e2412b86 100644 --- a/heat/tests/functional/test_WordPress_Single_Instance_With_HA.py +++ b/heat/tests/functional/test_WordPress_Single_Instance_With_HA.py @@ -20,7 +20,7 @@ import os @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'HA', +@attr(tag=['func', 'wordpress', 'HA', 'F17', 'WordPress_Single_Instance_With_HA.template']) class HaFunctionalTest(unittest.TestCase): def setUp(self): diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_IHA.py b/heat/tests/functional/test_WordPress_Single_Instance_With_IHA.py index 2f561316..e4525d5c 100644 --- a/heat/tests/functional/test_WordPress_Single_Instance_With_IHA.py +++ b/heat/tests/functional/test_WordPress_Single_Instance_With_IHA.py @@ -22,7 +22,7 @@ import time @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'HA', +@attr(tag=['func', 'wordpress', 'HA', 'F17', 'WordPress_Single_Instance_With_IHA.template']) class WordPressIHAFunctionalTest(unittest.TestCase): def setUp(self): diff --git a/heat/tests/functional/test_WordPress_With_LB.py b/heat/tests/functional/test_WordPress_With_LB.py index 44a042f8..005562d5 100644 --- a/heat/tests/functional/test_WordPress_With_LB.py +++ b/heat/tests/functional/test_WordPress_With_LB.py @@ -21,7 +21,7 @@ import os @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'LB', 'WordPress_With_LB.template']) +@attr(tag=['func', 'wordpress', 'LB', 'F17', 'WordPress_With_LB.template']) class WordPressWithLBFunctionalTest(unittest.TestCase): def setUp(self): template = 'WordPress_With_LB.template' diff --git a/heat/tests/functional/test_WordPress_With_RDS.py b/heat/tests/functional/test_WordPress_With_RDS.py index 9845cbc5..4ef14913 100644 --- a/heat/tests/functional/test_WordPress_With_RDS.py +++ b/heat/tests/functional/test_WordPress_With_RDS.py @@ -21,7 +21,7 @@ import unittest @attr(speed='slow') -@attr(tag=['func', 'wordpress', 'RDS', +@attr(tag=['func', 'wordpress', 'RDS', 'F17', 'WordPress_With_RDS.template']) class WordPressRDSFunctionalTest(unittest.TestCase): def setUp(self):