Ignore failed killings of already dead containers

oblador · Oct 31, 2023 · 52be4e7 · 52be4e7
1 parent 02c143c
commit 52be4e7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,11 +2,6 @@ name: Tests
 
 on:
   push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
 
 jobs:
   unit:
@@ -23,7 +18,7 @@ jobs:
       - name: Install dependencies
         run: yarn --frozen-lockfile --non-interactive --silent --ignore-scripts
       - name: Prepare docker
-        run: docker pull yukinying/chrome-headless-browser-stable:100.0.4896.127
+        run: docker pull yukinying/chrome-headless-browser-stable:118.0.5993.117
       - name: Run unit tests
         run: yarn test-ci
 

diff --git a/docs/command-line-arguments.md b/docs/command-line-arguments.md
@@ -29,7 +29,7 @@ yarn loki test -- --port 9009
 | **`--chromeAwsLambdaFunctionName`**     | Name of the use to capture screenshots.                                                                                                         | `loki`                                                    |
 | **`--chromeAwsLambdaRetries`**          | The number of retries for invoking the lambda, in case of failure.                                                                              | `0`                                                       |
 | **`--chromeConcurrency`**               | How many stories to test in parallel when using chrome                                                                                          | `4`                                                       |
-| **`--chromeDockerImage`**               | What docker image to use when running chrome                                                                                                    | `yukinying/chrome-headless-browser-stable:100.0.4896.127` |
+| **`--chromeDockerImage`**               | What docker image to use when running chrome                                                                                                    | `yukinying/chrome-headless-browser-stable:118.0.5993.117` |
 | **`--chromeDockerWithoutSeccomp`**      | Run chrome docker without custom seccomp settings.                                                                                              | `false`                                                   |
 | **`--chromeDockerUseCopy`**             | Use docker copy instead of volume mount for local stories                                                                                       | `false`                                                   |
 | **`--chromeEnableAnimations`**          | Enable CSS transitions and animations.                                                                                                          | `false`                                                   |

diff --git a/packages/runner/src/commands/test/default-options.json b/packages/runner/src/commands/test/default-options.json
@@ -4,7 +4,7 @@
   "chromeAwsLambdaBatchSize": "1",
   "chromeAwsLambdaBatchConcurrency": "1",
   "chromeConcurrency": "4",
-  "chromeDockerImage": "yukinying/chrome-headless-browser-stable:100.0.4896.127",
+  "chromeDockerImage": "yukinying/chrome-headless-browser-stable:118.0.5993.117",
   "chromeFlags": "--headless --disable-gpu --hide-scrollbars",
   "chromeLoadTimeout": "60000",
   "chromeRetries": "0",

diff --git a/packages/target-chrome-docker/src/create-chrome-docker-target.js b/packages/target-chrome-docker/src/create-chrome-docker-target.js
@@ -180,7 +180,13 @@ function createChromeDockerTarget({
   async function stop() {
     if (dockerId) {
       debug(`Killing chrome docker instance with id ${dockerId}`);
-      await execute(dockerPath, ['kill', dockerId]);
+      try {
+        await execute(dockerPath, ['kill', dockerId]);
+      } catch (e) {
+        if (e.toString().indexOf('No such container') === -1) {
+          throw e;
+        }
+      }
     } else {
       debug('No chrome docker instance to kill');
     }

diff --git a/packages/target-chrome-docker/src/create-chrome-docker-target.spec.js b/packages/target-chrome-docker/src/create-chrome-docker-target.spec.js
@@ -89,7 +89,7 @@ const storybook = [
 
 describe('createChromeTarget', () => {
   describe('.getStorybook', () => {
-    it(
+    it.only(
       'fetches stories from webpack dynamic bundles',
       async () => {
         expect(await fetchStorybookFixture('dynamic')).toEqual(storybook);