From 84306812349535fa9d3eea8db3be7a4268168e0e Mon Sep 17 00:00:00 2001
From: hardik <hardik.parekh@nectechnologies.in>
Date: Sat, 12 Sep 2015 14:33:58 +0530
Subject: [PATCH] Removed unused functional test.

I think bug #1418545 is fixed and decided that
such functionality will not be given in near
future. So no longer need of
test_environment_update_work_as_create test.

Change-Id: I4f63af92413bf279f7a564d785be8bec3840188f
---
 .../tests/functional/cli/v2/cli_tests_v2.py   | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/mistralclient/tests/functional/cli/v2/cli_tests_v2.py b/mistralclient/tests/functional/cli/v2/cli_tests_v2.py
index 2415d32c..725d3ce4 100644
--- a/mistralclient/tests/functional/cli/v2/cli_tests_v2.py
+++ b/mistralclient/tests/functional/cli/v2/cli_tests_v2.py
@@ -12,7 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from tempest_lib import decorators
 from tempest_lib import exceptions
 
 from mistralclient.tests.functional.cli import base
@@ -657,23 +656,6 @@ class EnvironmentCLITests(base_v2.MistralClientTestBase):
         self.assertEqual(env_created_at.split('.')[0], updated_env_created_at)
         self.assertIsNotNone(updated_env_updated_at)
 
-    @decorators.skip_because(bug="1418545")
-    def test_environment_update_work_as_create(self):
-        env = self.mistral_admin('environment-update', params='env.yaml')
-        env_name = self.get_value_of_field(env, 'Name')
-        env_desc = self.get_value_of_field(env, 'Description')
-
-        self.assertTableStruct(env, ['Field', 'Value'])
-
-        envs = self.mistral_admin('environment-list')
-        self.assertIn(env_name, [en['Name'] for en in envs])
-        self.assertIn(env_desc, [en['Description'] for en in envs])
-
-        self.mistral_admin('environment-delete', params=env_name)
-
-        envs = self.mistral_admin('environment-list')
-        self.assertNotIn(env_name, [en['Name'] for en in envs])
-
     def test_environment_get(self):
         env = self.environment_create('env.yaml')
         env_name = self.get_value_of_field(env, 'Name')
@@ -1143,6 +1125,15 @@ class NegativeCLITests(base_v2.MistralClientTestBase):
                           'environment-update',
                           params='env')
 
+    def test_env_update_nonexistant_env(self):
+        self.create_file('env.yaml',
+                         'name: env'
+                         'variables:\n  var: "value"')
+        self.assertRaises(exceptions.CommandFailed,
+                          self.mistral_admin,
+                          'environment-update',
+                          params='env.yaml')
+
     def test_env_create_without_name(self):
         self.create_file('env.yaml',
                          'variables:\n  var: "value"')