From 99f6b7c3eed6c1875de1cb2e59eecd82e8a7da81 Mon Sep 17 00:00:00 2001 From: Andre F de Miranda Date: Mon, 29 Aug 2016 15:19:27 +1000 Subject: [PATCH] NIFI-2688 - adjust ConfigEncryptionToolTest datePattern regex to cater for timezones with 4 characters --- .../apache/nifi/properties/ConfigEncryptionToolTest.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/groovy/org/apache/nifi/properties/ConfigEncryptionToolTest.groovy b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/groovy/org/apache/nifi/properties/ConfigEncryptionToolTest.groovy index 345870354771..33aef862f325 100644 --- a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/groovy/org/apache/nifi/properties/ConfigEncryptionToolTest.groovy +++ b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/groovy/org/apache/nifi/properties/ConfigEncryptionToolTest.groovy @@ -971,7 +971,7 @@ class ConfigEncryptionToolTest extends GroovyTestCase { // Format -- #Fri Aug 19 16:51:16 PDT 2016 // Alternate format -- #Fri Aug 19 16:51:16 GMT-05:00 2016 // \u0024 == '$' to avoid escaping - String datePattern = /^#\w{3} \w{3} \d{2} \d{2}:\d{2}:\d{2} \w{3}([\-+]\d{2}:\d{2})? \d{4}\u0024/ + String datePattern = /^#\w{3} \w{3} \d{2} \d{2}:\d{2}:\d{2} \w{3,4}([\-+]\d{2}:\d{2})? \d{4}\u0024/ // One extra line for the date assert lines.size() == properties.size() + 1 @@ -1566,4 +1566,4 @@ public class TestAppender extends AppenderBase { events.clear(); } } -} \ No newline at end of file +}