You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/06/24 19:13:20 UTC
svn commit: r1496126 -
/incubator/ambari/trunk/ambari-server/src/test/python/TestAmbaryServer.py
Author: swagle
Date: Mon Jun 24 17:13:20 2013
New Revision: 1496126
URL: http://svn.apache.org/r1496126
Log:
AMBARI-2476. Ambari Server setup tests are failing with ldap unit test. (swagle)
Modified:
incubator/ambari/trunk/ambari-server/src/test/python/TestAmbaryServer.py
Modified: incubator/ambari/trunk/ambari-server/src/test/python/TestAmbaryServer.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/python/TestAmbaryServer.py?rev=1496126&r1=1496125&r2=1496126&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/python/TestAmbaryServer.py (original)
+++ incubator/ambari/trunk/ambari-server/src/test/python/TestAmbaryServer.py Mon Jun 24 17:13:20 2013
@@ -26,6 +26,7 @@ import os, errno, tempfile
import signal
import stat
import datetime
+import operator
# We have to use this import HACK because the filename contains a dash
ambari_server = __import__('ambari-server')
FatalException = ambari_server.FatalException
@@ -2938,7 +2939,7 @@ class TestAmbariServer(TestCase):
{
"authentication.ldap.primaryUrl" : "test",
"authentication.ldap.secondaryUrl" : "test",
- "authentication.ldap.useSSL" : "true",
+ "authentication.ldap.useSSL" : "false",
"authentication.ldap.usernameAttribute" : "test",
"authentication.ldap.baseDn" : "test",
"authorization.userRoleName" : "test",
@@ -2946,11 +2947,14 @@ class TestAmbariServer(TestCase):
"authentication.ldap.bindAnonymously" : "true",
"authentication.ldap.managerDn" : "test",
"authentication.ldap.managerPassword" : \
- '${alias=ambari.ldap.manager.password}'
+ '${alias=ambari.ldap.manager.password}',
+ "client.security" : "ldap"
}
- self.assertEquals(sorted(update_properties_method.call_args[0][0]),
- sorted(ldap_properties_map))
+ sorted_x = sorted(ldap_properties_map.iteritems(), key=operator.itemgetter(0))
+ sorted_y = sorted(update_properties_method.call_args[0][0].iteritems(),
+ key=operator.itemgetter(0))
+ self.assertEquals(sorted_x, sorted_y)
self.assertTrue(update_properties_method.called)
self.assertTrue(configure_ldap_password_method.called)
self.assertTrue(get_validated_string_input_method.called)