Skip to content

Commit 9287ebb

Browse files
committed
Log container output and coverage file location
1 parent e1ba013 commit 9287ebb

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/grpc-web-conformance/jacoco.exec
21
/grpc-web-conformance/target/
32
/grpc-web-proxy/target/
43
/.idea/

grpc-web-conformance/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ COPY target/lib /root/lib
1212
COPY target/agent /root/agent
1313
WORKDIR "/root"
1414
ENV CLASSPATH="/root/classes:/root/lib/*"
15-
ENTRYPOINT ["./connectconformance", "--conf", "config.yaml", "--mode", "server", "--known-flaky", "Deadline Propagation/**", "--"]
15+
ENTRYPOINT ["./connectconformance", "-vv", "--trace", "--conf", "config.yaml", "--mode", "server", "--known-flaky", "Deadline Propagation/**", "--"]
1616
CMD ["java", "-javaagent:agent/org.jacoco.agent-runtime.jar=destfile=jacoco.exec,includes=com.radixiot.grpcweb.*", "com.radixiot.grpcweb.conformance.ConformanceMain"]

grpc-web-conformance/src/test/java/com/radixiot/grpcweb/conformance/RunConformanceTests.java

+16-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@
2222
import java.io.IOException;
2323
import java.io.InputStream;
2424
import java.io.InputStreamReader;
25+
import java.nio.file.Files;
26+
import java.nio.file.Path;
2527
import java.util.Objects;
2628

27-
import org.checkerframework.checker.nullness.qual.Nullable;
2829
import org.junit.jupiter.api.Test;
30+
import org.slf4j.Logger;
31+
import org.slf4j.LoggerFactory;
2932
import org.testcontainers.containers.GenericContainer;
33+
import org.testcontainers.containers.output.OutputFrame.OutputType;
3034
import org.testcontainers.containers.startupcheck.IndefiniteWaitOneShotStartupCheckStrategy;
3135
import org.testcontainers.utility.DockerImageName;
3236

@@ -35,6 +39,7 @@
3539
*/
3640
class RunConformanceTests {
3741

42+
private final Logger log = LoggerFactory.getLogger(getClass());
3843
private final DockerImageName imageName;
3944

4045
RunConformanceTests() throws IOException {
@@ -57,8 +62,16 @@ void runConformanceTests() {
5762

5863
container.start();
5964

60-
@Nullable String destFile = System.getProperty("jacoco.destFile");
61-
container.copyFileFromContainer("/root/jacoco.exec", destFile != null ? destFile : "jacoco.exec");
65+
log.info("Container stdout:\n{}", container.getLogs(OutputType.STDOUT));
66+
log.debug("Container stderr:\n{}", container.getLogs(OutputType.STDERR));
67+
68+
String destFile = System.getProperty("jacoco.destFile", "target/jacoco.exec");
69+
Path dest = Path.of(destFile).toAbsolutePath().normalize();
70+
log.info("Copying test coverage file to: {}", dest);
71+
container.copyFileFromContainer("/root/jacoco.exec", dest.toString());
72+
if (!Files.exists(dest)) {
73+
log.error("Failed to copy test coverage file");
74+
}
6275

6376
// one shot startup strategy waits until the container exits with a successful exit code
6477
assertThat(container.isRunning()).isFalse();

0 commit comments

Comments
 (0)