From 84941bf0a7993767b80a3073843f851fd41d9513 Mon Sep 17 00:00:00 2001
From: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Date: Wed, 01 Apr 2026 18:41:04 +0000
Subject: [PATCH] Merge master into copilot/fix-windows-service-start-issue Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
---
opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java | 5 +++--
opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java | 4 ++--
.github/workflows/build.yml | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9123cd5..17a6361 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,7 @@
on:
push:
+ branches: [ 'sustaining/4.10.x','master' ]
pull_request:
branches: [ 'sustaining/4.10.x','master' ]
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
index 0d0157a..a09226a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
@@ -1118,8 +1118,8 @@
final ResultCode expectedResultCode, String testName) throws Exception
{
TestTimer timer = new TestTimer.Builder()
- .maxSleep(10, SECONDS)
- .sleepTimes(10, MILLISECONDS)
+ .maxSleep(30, SECONDS)
+ .sleepTimes(100, MILLISECONDS)
.toTimer();
InternalSearchOperation searchOp = timer.repeatUntilSuccess(new Callable<InternalSearchOperation>()
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
index 18c087a..918acc4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
@@ -13,6 +13,7 @@
*
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems, LLC.
*/
package org.opends.server.tasks;
@@ -92,7 +93,7 @@
boolean isLoopback = localAddress.isLoopbackAddress();
String[] args =
{
- "-h", localIP,
+ "-h", "127.0.0.1",
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-b", "",
"-s", "base",
@@ -263,7 +264,7 @@
// anonymous connection.
args = new String[]
{
- "-h", localIP,
+ "-h", "127.0.0.1",
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-b", "",
"-s", "base",
--
Gitblit v1.10.0