heat tests : CFN_API functional tests NoEcho Parameters fix

NoEcho is now implemented in the engine for parameters, so we
need to change the expected ParameterValues to '******' to match
the API response for the NoEcho==True parameters

Change-Id: I4f50633dc5358e8779bfbaf03dda2f7fe1b7d452
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/heat/tests/functional/test_CFN_API_Actions.py b/heat/tests/functional/test_CFN_API_Actions.py
index 6c0b9d8c443c45ae908d96df7cbd8f83925c23c6..f197e2096bfc6aae9f9006e387b1f8a056e698c2 100644 (file)
--- a/heat/tests/functional/test_CFN_API_Actions.py
+++ b/heat/tests/functional/test_CFN_API_Actions.py
@@ -187,13 +187,13 @@ class CfnApiFunctionalTest(unittest.TestCase):
         self.assertEqual(disable_rollback, self.stack_disable_rollback)
 
         # Create a dict to lookup the expected template parameters
-        template_parameters = {'DBUsername': 'dbuser',
+        # NoEcho parameters are masked with 6 asterisks
+        template_parameters = {'DBUsername': '******',
                                'LinuxDistribution': 'F17',
                                'InstanceType': 'm1.xlarge',
-                               'DBRootPassword': 'admin',
+                               'DBRootPassword': '******',
                                'KeyName': self.stack.keyname,
-                               'DBPassword':
-                               os.environ['OS_PASSWORD'],
+                               'DBPassword': '******',
                                'DBName': 'wordpress'}
 
         # We do a fully qualified xpath lookup to extract the paramter

diff --git a/heat/tests/functional/test_CFN_API_Actions_Boto.py b/heat/tests/functional/test_CFN_API_Actions_Boto.py
index 165c1948aa232472bc163a54d525848f33b237a5..cbfd0ecf7bd17dac95e954be63f5f56e05dba1db 100644 (file)
--- a/heat/tests/functional/test_CFN_API_Actions_Boto.py
+++ b/heat/tests/functional/test_CFN_API_Actions_Boto.py
@@ -169,13 +169,13 @@ class CfnApiBotoFunctionalTest(unittest.TestCase):
                          self.stack_disable_rollback)
 
         # Create a dict to lookup the expected template parameters
-        template_parameters = {'DBUsername': 'dbuser',
+        # NoEcho parameters are masked with 6 asterisks
+        template_parameters = {'DBUsername': '******',
                                'LinuxDistribution': 'F17',
                                'InstanceType': 'm1.xlarge',
-                               'DBRootPassword': 'admin',
+                               'DBRootPassword': '******',
                                'KeyName': self.stack.keyname,
-                               'DBPassword':
-                               os.environ['OS_PASSWORD'],
+                               'DBPassword': '******',
                                'DBName': 'wordpress'}
 
         for key, value in template_parameters.iteritems():