Another fix for security tribe tests when ssl is disabled

Original commit: elastic/x-pack-elasticsearch@db2eca3522
This commit is contained in:
Ryan Ernst 2017-06-27 14:52:37 -07:00
parent e8472908c1
commit 84574c0367
1 changed files with 7 additions and 5 deletions

View File

@ -155,11 +155,13 @@ public class SecurityTribeIT extends NativeRealmIntegTestCase {
MockSecureSettings secureSettingsTemplate =
(MockSecureSettings) Settings.builder().put(cluster2SettingsSource.nodeSettings(0)).getSecureSettings();
MockSecureSettings secureSettings = new MockSecureSettings();
for (String settingName : secureSettingsTemplate.getSettingNames()) {
String settingValue = secureSettingsTemplate.getString(settingName).toString();
secureSettings.setString(settingName, settingValue);
secureSettings.setString("tribe.t1." + settingName, settingValue);
secureSettings.setString("tribe.t2." + settingName, settingValue);
if (secureSettingsTemplate != null) {
for (String settingName : secureSettingsTemplate.getSettingNames()) {
String settingValue = secureSettingsTemplate.getString(settingName).toString();
secureSettings.setString(settingName, settingValue);
secureSettings.setString("tribe.t1." + settingName, settingValue);
secureSettings.setString("tribe.t2." + settingName, settingValue);
}
}
Settings merged = Settings.builder()