This commit is contained in:
lxp
2026-10-27 14:35:18 +08:00
parent 27f5849657
commit 64fb4a7325
6 changed files with 120 additions and 4 deletions
@@ -17,6 +17,8 @@ import com.linkerbot.vibemake.service.oss.OssObjectStore;
import com.linkerbot.vibemake.service.support.*;
import org.junit.jupiter.api.*;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.*;
import org.springframework.boot.test.context.*;
@@ -167,6 +169,89 @@ class AdminWorkflowTest {
.asText();
}
private MockHttpServletRequestBuilder uploadRequest(String code, String sha) {
return signed(multipart("/admin-api/projects/" + code + "/uploads/commit")
.file(new MockMultipartFile("files", "sample.txt", "text/plain", "hello".getBytes()))
.param("expectedCommitSha", sha)
.param("message", "测试上传")
.param("paths", "models/sample.txt"));
}
private String writeState(String code) {
return jdbc.queryForObject(
"SELECT repo_write_status FROM project WHERE project_code=?", String.class, code);
}
@ParameterizedTest
@ValueSource(strings = {"upload", "publication"})
void readFailureBeforeUploadOrPublicationDoesNotBlockLaterWrites(String operation) throws Exception {
String code = createProject();
String initial = request(signed(get("/admin-api/projects/" + code + "/tree")), 200)
.path("data").path("commitSha").asText();
gitea.timeoutNextHead = true;
MockHttpServletRequestBuilder first = operation.equals("upload")
? uploadRequest(code, initial)
: signed(body(put("/admin-api/projects/" + code + "/publication"),
Map.of("commitSha", initial)));
JsonNode failure = request(first, 504);
assertThat(failure.path("code").asText()).isEqualTo("REMOTE_RESULT_UNKNOWN");
assertThat(failure.path("data").path("projectCode").asText()).isEqualTo(code);
assertThat(writeState(code)).isEqualTo("IDLE");
assertThat(request(signed(get("/admin-api/projects/" + code + "/tree")), 200)
.path("data").path("commitSha").asText()).isEqualTo(initial);
String current = operation.equals("upload")
? request(uploadRequest(code, initial), 200).path("data").path("commitSha").asText()
: initial;
assertThat(writeState(code)).isEqualTo("IDLE");
request(signed(body(put("/admin-api/projects/" + code + "/publication"),
Map.of("commitSha", current))), 200);
assertThat(writeState(code)).isEqualTo("IDLE");
assertThat(projectService.published(code).getPublishedCommitSha()).isEqualTo(current);
}
@Test
void uploadedCommitWithLostResponseStillBlocksPublicationAtLatestSha() throws Exception {
String code = createProject();
String initial = request(signed(get("/admin-api/projects/" + code + "/tree")), 200)
.path("data").path("commitSha").asText();
gitea.timeoutNextCommit = true;
JsonNode failure = request(uploadRequest(code, initial), 504);
assertThat(failure.path("code").asText()).isEqualTo("REMOTE_RESULT_UNKNOWN");
assertThat(failure.path("data").path("projectCode").asText()).isEqualTo(code);
assertThat(writeState(code)).isEqualTo("REVIEW");
String current = request(signed(get("/admin-api/projects/" + code + "/tree")), 200)
.path("data").path("commitSha").asText();
assertThat(current).isNotEqualTo(initial);
assertThat(request(signed(get("/admin-api/projects/" + code + "/files")
.param("path", "models/sample.txt")), 200)
.path("data").path("content").asText()).isEqualTo("hello");
JsonNode blocked = request(signed(body(
put("/admin-api/projects/" + code + "/publication"), Map.of("commitSha", current))), 409);
assertThat(blocked.path("code").asText()).isEqualTo("REMOTE_RESULT_UNKNOWN");
assertThat(writeState(code)).isEqualTo("REVIEW");
assertThat(projects.selectOne(new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<Project>()
.eq(Project::getProjectCode, code)).getPublishedCommitSha()).isNull();
// 只改数据库不能清除当前进程的待核对标记,下一次写入会重新持久化 REVIEW。
jdbc.update("UPDATE project SET repo_write_status='IDLE' WHERE project_code=?", code);
assertThat(writeState(code)).isEqualTo("IDLE");
JsonNode blockedAgain = request(signed(body(
put("/admin-api/projects/" + code + "/publication"), Map.of("commitSha", current))), 409);
assertThat(blockedAgain.path("code").asText()).isEqualTo("REMOTE_RESULT_UNKNOWN");
assertThat(writeState(code)).isEqualTo("REVIEW");
// 模拟核对远端结果后持锁恢复,同时清除数据库和本进程标记。
locks.serial(code, () -> {
locks.confirmKnownResult(code);
return null;
});
assertThat(writeState(code)).isEqualTo("IDLE");
request(signed(body(put("/admin-api/projects/" + code + "/publication"),
Map.of("commitSha", current))), 200);
assertThat(writeState(code)).isEqualTo("IDLE");
assertThat(projectService.published(code).getPublishedCommitSha()).isEqualTo(current);
}
private JsonNode createImport() throws Exception {
return request(
signed(
@@ -30,6 +30,7 @@ final class FakeGiteaClient implements GiteaClient {
final Map<String, String> migrationDescriptions = new HashMap<>();
private final Set<String> mainReady = new HashSet<>();
boolean timeoutNextCommit;
boolean timeoutNextHead;
boolean timeoutNextCreate;
boolean failNextCreate;
@@ -46,6 +47,7 @@ final class FakeGiteaClient implements GiteaClient {
deletionRejected = false;
mainConflict = false;
timeoutNextCommit = false;
timeoutNextHead = false;
timeoutNextCreate = false;
failNextCreate = false;
}
@@ -100,6 +102,10 @@ final class FakeGiteaClient implements GiteaClient {
@Override
public synchronized String head(Repository repository) {
if (timeoutNextHead) {
timeoutNextHead = false;
throw new GiteaFailure(504, "REMOTE_RESULT_UNKNOWN", "读取分支超时", false);
}
return repo(repository).head;
}