Zakaria/FlociClone
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
Zakaria
2026-10-15 10:25:56 -04:00
parent 33c480e7e1
commit bbe7e19554
2 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManagerTest.java
+17 -4
View File
@@ -444,7 +444,20 @@ class Ec2ContainerManagerTest {
@Test
void userDataExecutionCommandRunsScriptDirectlySoShebangIsHonored() {
assertArrayEquals(new String[]{"/var/lib/user-data.sh"}, Ec2ContainerManager.userDataExecutionCommand());
String[] command = Ec2ContainerManager.userDataExecutionCommand();
assertArrayEquals(new String[]{"sh", "-c"}, Arrays.copyOf(command, 2));
assertTrue(command[2].contains("/var/lib/user-data.sh"));
assertFalse(command[2].contains("sh /var/lib/user-data.sh"));
}
@Test
void userDataExecutionCommandRestoresPolicyAndStartsPackageServices() {
String command = Ec2ContainerManager.userDataExecutionCommand()[2];
assertTrue(command.contains("mv \"$backup\" \"$policy\""));
assertTrue(command.contains("service \"$service\" \"$action\""));
assertTrue(command.contains("exit \"$status\""));
}
@Test
@@ -1320,7 +1333,7 @@ class Ec2ContainerManagerTest {
verify(copy).withRemotePath("/var/lib");
verify(copy, never()).withRemotePath("/tmp");
assertTrue(harness.executedCommands.stream()
.anyMatch(command -> Arrays.equals(command, new String[]{"/var/lib/user-data.sh"})));
.anyMatch(command -> Arrays.equals(command, Ec2ContainerManager.userDataExecutionCommand())));
}
@Test
@@ -1780,7 +1793,7 @@ class Ec2ContainerManagerTest {
});
when(execCreate.exec()).thenAnswer(invocation -> {
String[] command = currentCommand.get();
return command != null && command.length == 1 && "/var/lib/user-data.sh".equals(command[0])
return Arrays.equals(command, Ec2ContainerManager.userDataExecutionCommand())
? userDataExec : metadataExec;
});
@@ -1969,7 +1982,7 @@ class Ec2ContainerManagerTest {
});
when(execCreate.exec()).thenAnswer(invocation -> {
String[] command = currentCommand.get();
if (command != null && command.length == 1 && "/var/lib/user-data.sh".equals(command[0])) {
if (Arrays.equals(command, Ec2ContainerManager.userDataExecutionCommand())) {
return userDataExec;
}
return metadataExec;