github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 08:12:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve rebase conflict markers

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-02 19:51:11 +00:00
parent eb816e0551
commit 7003615972
3 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/logging/console-settings.test.ts
View File

@@ -1,9 +1,5 @@
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import {
captureConsoleSnapshot,
type ConsoleSnapshot,
restoreConsoleSnapshot,
} from "./test-helpers/console-snapshot.js";
import { captureConsoleSnapshot, type ConsoleSnapshot } from "./test-helpers/console-snapshot.js";
vi.mock("./config.js", () => ({
readLoggingConfig: () => undefined,
@@ -42,7 +38,6 @@ beforeEach(() => {
});
afterEach(() => {
<<<<<<< HEAD
console.log = snapshot.log;
console.info = snapshot.info;
console.warn = snapshot.warn;
@@ -54,16 +49,6 @@ afterEach(() => {
} else {
process.env.OPENCLAW_TEST_CONSOLE = originalOpenClawTestConsole;
}
||||||| parent of 4a741746c (refactor: dedupe agent and reply runtimes)
console.log = snapshot.log;
console.info = snapshot.info;
console.warn = snapshot.warn;
console.error = snapshot.error;
console.debug = snapshot.debug;
console.trace = snapshot.trace;
=======
restoreConsoleSnapshot(snapshot);
>>>>>>> 4a741746c (refactor: dedupe agent and reply runtimes)
Object.defineProperty(process.stdout, "isTTY", { value: originalIsTty, configurable: true });
logging.setConsoleConfigLoaderForTests();
vi.restoreAllMocks();