From f6b1b515c467404a16affaecf85a15c75bdd26b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Fran=C3=A7oise?= <Vincent.FRANCOISE@b-com.com>
Date: Mon, 4 Jul 2016 16:18:59 +0200
Subject: [PATCH] Fix failing Tempest tests

In this changeset, I fixed the 3 failing tests on the Tempest test
suite.

Change-Id: I3d31ea1c13b340a2a16b41c31198d7be4711400c
Closes-Bug: #1595534
---
 .../tests/api/admin/test_audit_template.py                | 8 ++++----
 .../tests/scenario/test_execute_basic_optim.py            | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/watcher_tempest_plugin/tests/api/admin/test_audit_template.py b/watcher_tempest_plugin/tests/api/admin/test_audit_template.py
index 6b0b2edb5..045ca1fc3 100644
--- a/watcher_tempest_plugin/tests/api/admin/test_audit_template.py
+++ b/watcher_tempest_plugin/tests/api/admin/test_audit_template.py
@@ -29,7 +29,7 @@ class TestCreateDeleteAuditTemplate(base.BaseInfraOptimTest):
 
     @test.attr(type='smoke')
     def test_create_audit_template(self):
-        goal_name = "DUMMY"
+        goal_name = "dummy"
         _, goal = self.client.show_goal(goal_name)
 
         params = {
@@ -58,7 +58,7 @@ class TestCreateDeleteAuditTemplate(base.BaseInfraOptimTest):
 
     @test.attr(type='smoke')
     def test_create_audit_template_unicode_description(self):
-        goal_name = "DUMMY"
+        goal_name = "dummy"
         _, goal = self.client.show_goal(goal_name)
         # Use a unicode string for testing:
         params = {
@@ -86,7 +86,7 @@ class TestCreateDeleteAuditTemplate(base.BaseInfraOptimTest):
 
     @test.attr(type='smoke')
     def test_delete_audit_template(self):
-        _, goal = self.client.show_goal("DUMMY")
+        _, goal = self.client.show_goal("dummy")
         _, body = self.create_audit_template(goal=goal['uuid'])
         audit_uuid = body['uuid']
 
@@ -102,7 +102,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
     @classmethod
     def resource_setup(cls):
         super(TestAuditTemplate, cls).resource_setup()
-        _, cls.goal = cls.client.show_goal("DUMMY")
+        _, cls.goal = cls.client.show_goal("dummy")
         _, cls.strategy = cls.client.show_strategy("dummy")
         _, cls.audit_template = cls.create_audit_template(
             goal=cls.goal['uuid'], strategy=cls.strategy['uuid'])
diff --git a/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py b/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py
index 93b53958a..9e19b9d58 100644
--- a/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py
+++ b/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py
@@ -96,7 +96,6 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest):
                                wait_until='ACTIVE',
                                clients=self.mgr)
 
-    @test.services('compute', 'network', 'image')
     def test_execute_basic_action_plan(self):
         """Execute an action plan based on the BASIC strategy
 
@@ -114,7 +113,7 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest):
 
         self.assertTrue(test.call_until_true(
             func=functools.partial(self.has_audit_succeeded, audit['uuid']),
-            duration=300,
+            duration=600,
             sleep_for=2
         ))
         _, action_plans = self.client.list_action_plans(
@@ -132,7 +131,7 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest):
         self.assertTrue(test.call_until_true(
             func=functools.partial(
                 self.has_action_plan_finished, action_plan['uuid']),
-            duration=300,
+            duration=600,
             sleep_for=2
         ))
         _, finished_ap = self.client.show_action_plan(action_plan['uuid'])