From 7db918a438590360c2660b1d2cbc5cc0bc0f6831 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Wed, 3 May 2023 16:59:20 -0600 Subject: [PATCH 1/2] daemon: update config with new bundle id Update web server daemon config to reflect the application's new bundle id: com.git-ecosystem.gitbundleserver. Signed-off-by: Lessley Dennington --- cmd/git-bundle-server/web-server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/git-bundle-server/web-server.go b/cmd/git-bundle-server/web-server.go index 6876495..2683d26 100644 --- a/cmd/git-bundle-server/web-server.go +++ b/cmd/git-bundle-server/web-server.go @@ -42,7 +42,7 @@ func (w *webServerCmd) getDaemonConfig(ctx context.Context) (*daemon.DaemonConfi } return &daemon.DaemonConfig{ - Label: "com.github.gitbundleserver", + Label: "com.git-ecosystem.gitbundleserver", Description: "Web server hosting Git Bundle Server content", Program: programPath, }, nil From f68ba8486e42784e901e19aa21c98372a36c4ea1 Mon Sep 17 00:00:00 2001 From: Lessley Dennington Date: Wed, 3 May 2023 17:04:35 -0600 Subject: [PATCH 2/2] integration tests: remove commented daemon step Remove the currently-commented "After" step for daemon tests. If uncommented, this step would stop a running daemon, which could cause issues for users who had started their daemons before an integration test run and would expect them to still be running after the test run completes. Signed-off-by: Lessley Dennington --- test/integration/features/step_definitions/daemon.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/integration/features/step_definitions/daemon.ts b/test/integration/features/step_definitions/daemon.ts index e0389d7..9d1e8a9 100644 --- a/test/integration/features/step_definitions/daemon.ts +++ b/test/integration/features/step_definitions/daemon.ts @@ -26,10 +26,3 @@ Then('the daemon is not running', async function (this: IntegrationBundleServerW var daemonStatus = this.getDaemonState() assert.strictEqual(daemonStatus, DaemonState.NotRunning) }) - -// After({tags: '@daemon'}, async function (this: IntegrationBundleServerWorld) { -// var daemonState = this.getDaemonState() -// if (daemonState === DaemonState.Running) { -// this.runCommand('git-bundle-server web-server stop') -// } -// });