Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix incorrect path for RABBITMQ_CONFIG_FILE #5184

Merged
merged 4 commits into from Apr 7, 2022
Merged

Fix incorrect path for RABBITMQ_CONFIG_FILE #5184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99925ab
Fix incorrect path for RABBITMQ_CONFIG_FILE
mdedetrich Mar 27, 2022
2929c62
Change config file tests to check for effect of applied config
kiview Apr 7, 2022
89dc9f4
Add missing default logback, to avoid verbose logs
kiview Apr 7, 2022
b9164fd
Further cleanup of tests
kiview Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
View file
Open in desktop
Expand Up @@ -396,7 +396,7 @@ public RabbitMQContainer withRabbitMQConfig(MountableFile rabbitMQConf) {
* @return This container.
*/
public RabbitMQContainer withRabbitMQConfigSysctl(MountableFile rabbitMQConf) {
withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom");
withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom.conf");
return withCopyFileToContainer(rabbitMQConf, "/etc/rabbitmq/rabbitmq-custom.conf");
}

Expand Down
24 changes: 9 additions & 15 deletions modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
View file
Open in desktop
Expand Up @@ -14,13 +14,16 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.security.KeyManagementException;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.UnrecoverableKeyException;
import java.security.cert.CertificateException;
import java.util.Collections;
import java.util.Objects;
import java.util.Scanner;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
Expand Down Expand Up @@ -115,43 +118,34 @@ public void shouldCreateRabbitMQContainerWithQueues() throws IOException, Interr
}

@Test
public void shouldMountConfigurationFile()
{
public void shouldMountConfigurationFile() {
try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {

container.withRabbitMQConfig(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
container.start();

assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.conf");
assertThat(container.getLogs()).doesNotContain(" (not found)");
assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
}
}


@Test
public void shouldMountConfigurationFileErlang()
{
public void shouldMountConfigurationFileErlang() {
try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {

container.withRabbitMQConfigErlang(MountableFile.forClasspathResource("/rabbitmq-custom.config"));
container.start();

assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.config");
assertThat(container.getLogs()).doesNotContain(" (not found)");
assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
}
}


@Test
public void shouldMountConfigurationFileSysctl()
{
public void shouldMountConfigurationFileSysctl() {
try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {

container.withRabbitMQConfigSysctl(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
container.start();

assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.conf");
assertThat(container.getLogs()).doesNotContain(" (not found)");
assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
}
}

Expand Down
16 changes: 16 additions & 0 deletions modules/rabbitmq/src/test/resources/logback-test.xml
View file
Open in desktop
@@ -0,0 +1,16 @@
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are assigned the type
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
<encoder>
<pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
</encoder>
</appender>

<root level="INFO">
<appender-ref ref="STDOUT"/>
</root>

<logger name="org.testcontainers" level="DEBUG"/>
</configuration>
3 changes: 1 addition & 2 deletions modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
View file
Open in desktop
@@ -1,2 +1 @@
loopback_users.guest = false
listeners.tcp.default = 5555
log.console.level = debug
18 changes: 7 additions & 11 deletions modules/rabbitmq/src/test/resources/rabbitmq-custom.config
View file
Open in desktop
@@ -1,13 +1,9 @@
[
{ rabbit, [
{ loopback_users, [ ] },
{ tcp_listeners, [ 5555 ] },
{ ssl_listeners, [ ] },
{ default_vhost, <<"vhost">> },
{ hipe_compile, false }
] },
{ rabbitmq_management, [ { listener, [
{ port, 15672 },
{ ssl, false }
] } ] }
{rabbit,
[
{log,
[{console, [{level, debug}]}]
}
]
}
].