Merge branch '4.20'

harikrishna-patnala · harikrishna-patnala · commit c2c1e11580e9 · 2025-10-26T16:23:10.000+05:30
diff --git a/server/src/test/java/org/apache/cloudstack/vm/schedule/VMSchedulerImplTest.java b/server/src/test/java/org/apache/cloudstack/vm/schedule/VMSchedulerImplTest.java
@@ -238,7 +238,7 @@ public void testScheduleNextJobScheduleFutureScheduleWithTimeZoneChecks() throws
         Date expectedScheduledTime = Date.from(zonedDateTime.toInstant());
 
         if (expectedScheduledTime.before(startDate)) {
-            expectedScheduledTime = DateUtils.addDays(expectedScheduledTime, 1);
+            expectedScheduledTime = Date.from(zonedDateTime.plusDays(1).toInstant());
         }
 
         Date actualScheduledTime = vmScheduler.scheduleNextJob(vmSchedule, new Date());

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public void testScheduleNextJobScheduleFutureScheduleWithTimeZoneChecks() throws`
`238`	`238`	`Date expectedScheduledTime = Date.from(zonedDateTime.toInstant());`
`239`	`239`
`240`	`240`	`if (expectedScheduledTime.before(startDate)) {`
`241`		`- expectedScheduledTime = DateUtils.addDays(expectedScheduledTime, 1);`
	`241`	`+ expectedScheduledTime = Date.from(zonedDateTime.plusDays(1).toInstant());`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`Date actualScheduledTime = vmScheduler.scheduleNextJob(vmSchedule, new Date());`