Skip to content

Commit 4f08786

Browse files
committed
Ignore Specific Git Error, Clean Up Tests
1 parent d1e577f commit 4f08786

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

CodeEdit/Features/SourceControl/SourceControlManager+GitClient.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ extension SourceControlManager {
170170

171171
await setChangedFiles(status.changedFiles + status.untrackedFiles)
172172
await refreshStatusInFileManager()
173+
} catch GitClient.GitClientError.notGitRepository {
174+
await setChangedFiles([])
173175
} catch {
174176
logger.error("Error fetching git status: \(error)")
175177
await setChangedFiles([])

CodeEditTests/Features/Tasks/CEActiveTaskTests.swift

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,27 @@ class CEActiveTaskTests {
2828
#expect(activeTask.task == task, "Active task should be initialized with the provided CETask.")
2929
}
3030

31-
@Test(.timeLimit(.minutes(1)))
31+
@Test
3232
func testRunMethod() async throws {
3333
activeTask.run(workspaceURL: nil)
34+
await waitForExpectation(timeout: .seconds(10)) {
35+
activeTask.status == .running
36+
} onTimeout: {
37+
Issue.record("Task never started. \(activeTask.status)")
38+
}
3439
activeTask.waitForExit()
3540

3641
await waitForExpectation {
3742
activeTask.status == .finished
3843
} onTimeout: {
39-
Issue.record("Status never changed to finished.")
44+
Issue.record("Status never changed to finished. \(activeTask.status)")
4045
}
4146

4247
let output = try #require(activeTask.output)
4348
#expect(output.getBufferAsString().contains("Testing"))
4449
}
4550

46-
@Test(.timeLimit(.minutes(1)))
51+
@Test
4752
func testHandleProcessFinished() async throws {
4853
task.command = "aNon-existentCommand"
4954
activeTask.run(workspaceURL: nil)

CodeEditTests/Features/Tasks/TaskManagerTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class TaskManagerTests {
3333
taskManager.selectedTaskID = task.id
3434
taskManager.executeActiveTask()
3535

36-
await waitForExpectation(timeout: .seconds(1)) {
36+
await waitForExpectation(timeout: .seconds(10)) {
3737
self.taskManager.activeTasks[task.id]?.status == .finished
3838
} onTimeout: {
3939
Issue.record("Status never changed to finished.")

0 commit comments

Comments
 (0)