Bladeren bron

Merge pull request #6323 from overleaf/jpa-web-remove-gnu-parallel

[web] remove old way of running unit tests in parallel

GitOrigin-RevId: 77ff350824f7e21a44dae3f233ee9eedcf07c389
June Kelly 4 jaren geleden
bovenliggende
commit
0e2997a237
3 gewijzigde bestanden met toevoegingen van 0 en 13 verwijderingen
  1. 0 4
      services/web/Dockerfile
  2. 0 8
      services/web/Makefile
  3. 0 1
      services/web/package.json

+ 0 - 4
services/web/Dockerfile

@@ -7,10 +7,6 @@ WORKDIR /overleaf/services/web
 # install_deps changes app files and installs npm packages
 # as such it has to run at a later stage
 
-RUN apt-get update \
-&&  apt-get install -y parallel \
-&&  rm -rf /var/lib/apt/lists/*
-
 RUN mkdir /overleaf/services/web/node_modules \
 &&  chown node:node /overleaf/services/web/node_modules
 

+ 0 - 8
services/web/Makefile

@@ -108,14 +108,6 @@ test_unit_app_parallel_gnu_make_docker:
 		make test_unit_app_parallel_gnu_make --output-sync -j $(J)
 	$(DOCKER_COMPOSE) down -v -t 0
 
-test_unit_app_parallel: test_unit_app_parallel_gnu_parallel
-test_unit_app_parallel_gnu_parallel: export COMPOSE_PROJECT_NAME = \
-	unit_test_parallel_$(BUILD_DIR_NAME)
-test_unit_app_parallel_gnu_parallel:
-	$(DOCKER_COMPOSE) down -v -t 0
-	$(DOCKER_COMPOSE) run --rm test_unit npm run test:unit:app:parallel
-	$(DOCKER_COMPOSE) down -v -t 0
-
 TEST_UNIT_MODULES = $(MODULE_DIRS:=/test_unit)
 $(TEST_UNIT_MODULES): %/test_unit: %/Makefile
 test_unit_modules: $(TEST_UNIT_MODULES)

+ 0 - 1
services/web/package.json

@@ -18,7 +18,6 @@
     "test:unit:all": "npm run test:unit:run_dir -- test/unit/src modules/*/test/unit/src",
     "test:unit:all:silent": "npm run test:unit:all -- --reporter dot",
     "test:unit:app": "npm run test:unit:run_dir -- test/unit/src",
-    "test:unit:app:parallel": "parallel --plain --keep-order --halt now,fail=1 npm run test:unit:run_dir -- {} ::: test/unit/src/*",
     "test:frontend": "NODE_ENV=test TZ=GMT mocha --recursive --timeout 5000 --exit --grep=$MOCHA_GREP --require test/frontend/bootstrap.js test/frontend modules/*/test/frontend",
     "test:frontend:coverage": "c8 --all --include 'frontend/js' --include 'modules/*/frontend/js' --exclude 'frontend/js/vendor' --reporter=lcov --reporter=text-summary npm run test:frontend",
     "test:karma": "karma start",