From 40f82de4a1fa0bf3b76186687aca42463ce26396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20B=C3=BCscher?= <christoph@elastic.co>
Date: Fri, 6 Nov 2015 10:56:13 +0100
Subject: [PATCH] Tests: make sure to load timezones in parent classloader

When GroovySecurityTests are run before any other test using
time zones, joda ZoneInfoProvider fails to load the time zones
correctly and never tries again later. This makes sure we load it
correctly on startup.

Relates to #14524
---
 .../elasticsearch/script/groovy/GroovySecurityTests.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/lang-groovy/src/test/java/org/elasticsearch/script/groovy/GroovySecurityTests.java b/plugins/lang-groovy/src/test/java/org/elasticsearch/script/groovy/GroovySecurityTests.java
index b222b44b838..258d957d77e 100644
--- a/plugins/lang-groovy/src/test/java/org/elasticsearch/script/groovy/GroovySecurityTests.java
+++ b/plugins/lang-groovy/src/test/java/org/elasticsearch/script/groovy/GroovySecurityTests.java
@@ -39,6 +39,12 @@ public class GroovySecurityTests extends ESTestCase {
 
     private GroovyScriptEngineService se;
 
+    static {
+        // ensure we load all the timezones in the parent classloader with all permissions
+        // relates to https://github.com/elastic/elasticsearch/issues/14524
+        org.joda.time.DateTimeZone.getDefault();
+    }
+
     @Override
     public void setUp() throws Exception {
         super.setUp();