Skip to content

Commit a434e41

Browse files
committed
Bump io.airlift:bom from 380 to 381
Bumps [io.airlift:bom](https://github.com/airlift/airlift) from 380 to 381. - [Release notes](https://github.com/airlift/airlift/releases) - [Changelog](https://github.com/airlift/airlift/blob/master/NEWS) - [Commits](https://github.com/airlift/airlift/commits) --- updated-dependencies: - dependency-name: io.airlift:bom dependency-version: '381' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
1 parent 47b5e74 commit a434e41

File tree

17 files changed

+24
-18
lines changed

17 files changed

+24
-18
lines changed

client/trino-client/src/test/java/io/trino/client/TestSSL.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void setUp()
6767
{
6868
Bootstrap app = new Bootstrap(
6969
new TestingNodeModule(),
70-
new TestingHttpServerModule(),
70+
new TestingHttpServerModule("test-ssl"),
7171
binder -> binder.bind(Servlet.class).toInstance(new TestingHttpServlet()))
7272
.setRequiredConfigurationProperties(
7373
ImmutableMap.<String, String>builder()

core/trino-main/src/main/java/io/trino/server/testing/TestingTrinoServer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
import static java.nio.file.Files.createTempDirectory;
151151
import static java.nio.file.Files.isDirectory;
152152
import static java.util.Objects.requireNonNull;
153+
import static java.util.UUID.randomUUID;
153154
import static java.util.concurrent.TimeUnit.MILLISECONDS;
154155

155156
public class TestingTrinoServer
@@ -179,6 +180,7 @@ public static Builder builder()
179180
return new Builder();
180181
}
181182

183+
private final String instanceId;
182184
private final Injector injector;
183185
private final Path baseDataDir;
184186
private final boolean preserveData;
@@ -257,6 +259,7 @@ private TestingTrinoServer(
257259
Consumer<TestingTrinoServer> additionalConfiguration,
258260
CatalogMangerKind catalogMangerKind)
259261
{
262+
this.instanceId = randomUUID().toString();
260263
this.coordinator = coordinator;
261264

262265
this.baseDataDir = baseDataDir.orElseGet(TestingTrinoServer::tempDirectory);
@@ -297,7 +300,7 @@ private TestingTrinoServer(
297300

298301
ImmutableList.Builder<Module> modules = ImmutableList.<Module>builder()
299302
.add(new TestingNodeModule(environment))
300-
.add(new TestingHttpServerModule(httpPort))
303+
.add(new TestingHttpServerModule("testing-trino-" + instanceId, httpPort))
301304
.add(new JsonModule())
302305
.add(new JaxrsModule())
303306
.add(new MBeanModule())

core/trino-main/src/test/java/io/trino/failuredetector/TestHeartbeatFailureDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void testExcludesCurrentNode()
5454
new TestingNodeModule(),
5555
new TestingJmxModule(),
5656
new TestingDiscoveryModule(),
57-
new TestingHttpServerModule(),
57+
new TestingHttpServerModule("test-heartbeat-failure-detector"),
5858
new JsonModule(),
5959
new JaxrsModule(),
6060
new FailureDetectorModule(),

core/trino-main/src/test/java/io/trino/node/TestAnnounceNodeInventory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private static AnnouncementServer createAnnounceServer()
163163
{
164164
ImmutableList.Builder<Module> modules = ImmutableList.<Module>builder()
165165
.add(new TestingNodeModule())
166-
.add(new TestingHttpServerModule())
166+
.add(new TestingHttpServerModule("test-announce-server"))
167167
.add(new JsonModule())
168168
.add(new JaxrsModule())
169169
.add(new AnnounceNodeInventoryModule())

core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,7 @@ private static TestingHttpServer createTestingJwkServer()
14681468
HttpServerConfig config = new HttpServerConfig().setHttpPort(0);
14691469
HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
14701470

1471-
return new TestingHttpServer(httpServerInfo, nodeInfo, config, new JwkServlet());
1471+
return new TestingHttpServer("testing-jwks-server", httpServerInfo, nodeInfo, config, new JwkServlet());
14721472
}
14731473

14741474
private static class JwkServlet

core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOidcDiscovery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ public MetadataServer(HttpServlet servlet)
311311
NodeInfo nodeInfo = new NodeInfo("test");
312312
HttpServerConfig config = new HttpServerConfig().setHttpPort(0);
313313
HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
314-
httpServer = new TestingHttpServer(httpServerInfo, nodeInfo, config, servlet);
314+
httpServer = new TestingHttpServer("testing-metadata-server", httpServerInfo, nodeInfo, config, servlet);
315315
httpServer.start();
316316
}
317317

core/trino-main/src/test/java/io/trino/server/security/oauth2/TestingHydraIdentityProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ private TestingHttpServer createTestingLoginAndConsentServer()
232232
.setNodeInternalAddress(InetAddresses.toAddrString(InetAddress.getLocalHost())));
233233
HttpServerConfig config = new HttpServerConfig().setHttpPort(0);
234234
HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
235-
return new TestingHttpServer(httpServerInfo, nodeInfo, config, new AcceptAllLoginsAndConsentsServlet());
235+
return new TestingHttpServer("testing-login-and-consent-server", httpServerInfo, nodeInfo, config, new AcceptAllLoginsAndConsentsServlet());
236236
}
237237

238238
private class AcceptAllLoginsAndConsentsServlet

core/trino-main/src/test/java/io/trino/server/ui/TestWebUi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ private static TestingHttpServer createTestingJwkServer()
12481248
HttpServerConfig config = new HttpServerConfig().setHttpPort(0);
12491249
HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
12501250

1251-
return new TestingHttpServer(httpServerInfo, nodeInfo, config, new JwkServlet());
1251+
return new TestingHttpServer("testing-jwk-server", httpServerInfo, nodeInfo, config, new JwkServlet());
12521252
}
12531253

12541254
private static class JwkServlet

lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/TestHttpFileBasedAccessControl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
public class TestHttpFileBasedAccessControl
3434
extends BaseFileBasedConnectorAccessControlTest
3535
{
36-
private final TestingHttpServer testingHttpServer = new TestingHttpServer();
36+
private final TestingHttpServer testingHttpServer = new TestingHttpServer("file-based-access-control");
3737

3838
@AfterAll
3939
public void tearDown()

lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/TestHttpFileBasedSystemAccessControl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
public class TestHttpFileBasedSystemAccessControl
3434
extends BaseFileBasedSystemAccessControlTest
3535
{
36-
private final TestingHttpServer testingHttpServer = new TestingHttpServer();
36+
private final TestingHttpServer testingHttpServer = new TestingHttpServer("file-based-system-access-control");
3737

3838
@AfterAll
3939
public void tearDown()

0 commit comments

Comments
 (0)