Skip to content

Commit 39d5106

Browse files
Merge branch 'alexeyk/test-base-arm64-fixes' into alexeyk/test-base-windows
# Conflicts: # communication/src/test/java/datadog/communication/serialization/msgpack/MsgPackWriterTest.java # components/json/src/test/java/datadog/json/JsonReaderTest.java # dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java
2 parents 70ca196 + 2f7d96c commit 39d5106

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

communication/src/test/java/datadog/communication/serialization/msgpack/MsgPackWriterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.msgpack.core.MessageUnpacker;
3434

3535
public class MsgPackWriterTest {
36-
// Explicit escapes for non-ASCII test data so it is independent of container settings.
36+
// Explicit escapes for non-ASCII chars to make test independent of container settings.
3737
private static final String NON_ASCII_STRING = "foob\u00E1r_\u263a"; // foobár_☺
3838
private static final byte[] NON_ASCII_BYTES = NON_ASCII_STRING.getBytes(UTF_8);
3939
private static final int NON_ASCII_BUFFER_CAPACITY = NON_ASCII_BYTES.length + 1;
@@ -666,7 +666,7 @@ public String toString() {
666666
}
667667
}));
668668
writer.writeObjectString(value, null);
669-
writer.writeObjectString(value, s -> "foobàr".getBytes(UTF_8));
669+
writer.writeObjectString(value, s -> NON_ASCII_BYTES);
670670
}
671671

672672
@Test

components/json/src/test/java/datadog/json/JsonReaderTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ void testStringEscaping() {
215215
assertEquals("\n", reader.nextString());
216216
assertEquals("\r", reader.nextString());
217217
assertEquals("\t", reader.nextString());
218+
// Explicit escape for non-ASCII `É` to make test independent of container settings.
218219
assertEquals("\u00C9", reader.nextString());
219220
reader.endArray();
220221
} catch (IOException e) {

dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,8 @@ private static Stream<Arguments> elfBinaries() {
137137
@ParameterizedTest(name = "ELF: {1}")
138138
@MethodSource("elfBinaries")
139139
void testElfBuildIdExtraction(String containerPath, String description) throws Exception {
140-
assumeFalse(
141-
OperatingSystem.architecture() == ARM64,
142-
"ELF test uses x86_64 container library paths and is not portable to arm64");
140+
// TODO: check if arm64 can be supported too.
141+
assumeFalse(OperatingSystem.architecture() == ARM64, "Skipping for arm64");
143142
Path localBinary = copyFromContainer(linuxContainer, containerPath);
144143

145144
ElfBuildIdExtractor extractor = new ElfBuildIdExtractor();

0 commit comments

Comments
 (0)