Merge remote-tracking branch 'origin/AC-6656' into Hammer_Community_Backlog_21092022

Author: glo71317

lib/internal/Magento/Framework/Setup/Test/Unit/ListsTest.php

@@ -24,16 +24,6 @@ class ListsTest extends TestCase
      */
     private $mockConfig;
 
-    /**
-     * @var array
-     */
-    private $expectedTimezones = [
-        'Australia/Darwin',
-        'America/Los_Angeles',
-        'Europe/Kiev',
-        'Asia/Jerusalem',
-    ];
-
     /**
      * @var array
      */
@@ -56,6 +46,16 @@ class ListsTest extends TestCase
         'sr_Latn_RS' => 'Serbian (Latin, Serbia)'
     ];
 
+    private function getExpectedTimezones($timeZone): array
+    {
+        return [
+            'Australia/Darwin',
+            'America/Los_Angeles',
+            $timeZone,
+            'Asia/Jerusalem',
+        ];
+    }
+
     protected function setUp(): void
     {
         $this->mockConfig = $this->getMockBuilder(ConfigInterface::class)
@@ -71,8 +71,11 @@ protected function setUp(): void
 
     public function testGetTimezoneList()
     {
-        $timezones = array_intersect($this->expectedTimezones, array_keys($this->lists->getTimezoneList()));
-        $this->assertEquals($this->expectedTimezones, $timezones);
+        $resultTimezone = array_keys($this->lists->getTimezoneList());
+        $timeZone = in_array('Europe/Kyiv', $resultTimezone) ? 'Europe/Kyiv' : 'Europe/Kiev';
+        $expectedTimezones = $this->getExpectedTimezones($timeZone);
+        $timezones = array_intersect($expectedTimezones, $resultTimezone);
+        $this->assertEquals($expectedTimezones, $timezones);
     }
 
     public function testGetLocaleList()