From 1309be15bb5c4b99ed33ae32d18f93b6255380b3 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 18 Sep 2023 12:29:10 +0200 Subject: [PATCH] make sure root logger is loaded before FS mock in tests Signed-off-by: Patrik Oldsberg --- plugins/app-backend/src/service/appPlugin.test.ts | 4 ++++ .../actions/builtin/publish/githubPullRequest.test.ts | 5 ++++- .../actions/builtin/publish/gitlabMergeRequest.test.ts | 5 ++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/plugins/app-backend/src/service/appPlugin.test.ts b/plugins/app-backend/src/service/appPlugin.test.ts index b6a972b4c7..09061b287d 100644 --- a/plugins/app-backend/src/service/appPlugin.test.ts +++ b/plugins/app-backend/src/service/appPlugin.test.ts @@ -19,6 +19,10 @@ import { resolve as resolvePath } from 'path'; import fetch from 'node-fetch'; import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; import { appPlugin } from './appPlugin'; +import { createRootLogger } from '@backstage/backend-common'; + +// Make sure root logger is initialized ahead of FS mock +createRootLogger(); describe('appPlugin', () => { beforeEach(() => { diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts index 82f8d22aea..b6987335f9 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { getRootLogger } from '@backstage/backend-common'; +import { createRootLogger, getRootLogger } from '@backstage/backend-common'; import { ConfigReader } from '@backstage/config'; import { GithubCredentialsProvider, @@ -33,6 +33,9 @@ import { OctokitWithPullRequestPluginClient, } from './githubPullRequest'; +// Make sure root logger is initialized ahead of FS mock +createRootLogger(); + const root = os.platform() === 'win32' ? 'C:\\root' : '/root'; const workspacePath = resolvePath(root, 'my-workspace'); diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.test.ts index afb93b348a..6445d243b5 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.test.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { getRootLogger } from '@backstage/backend-common'; +import { createRootLogger, getRootLogger } from '@backstage/backend-common'; import { ConfigReader } from '@backstage/config'; import { ScmIntegrations } from '@backstage/integration'; import { TemplateAction } from '@backstage/plugin-scaffolder-node'; @@ -23,6 +23,9 @@ import { resolve as resolvePath } from 'path'; import { Writable } from 'stream'; import { createPublishGitlabMergeRequestAction } from './gitlabMergeRequest'; +// Make sure root logger is initialized ahead of FS mock +createRootLogger(); + const root = os.platform() === 'win32' ? 'C:\\root' : '/root'; const workspacePath = resolvePath(root, 'my-workspace');