put back the test stage and dont allow failure

.gitlab-ci.yml

 stages:
   - check
-  # - test
+  - test
   - automated_test
 
 .before_script: &before_script
@@ -38,19 +38,19 @@ checks:
     #  Pass list of modified files to pre-commit so that it only checks them
     - echo $FILES | xargs pre-commit run --color=always --files
 
-# pytest:
-#   stage: test
-#   only: [merge_requests]
-#   <<: *before_script
-#   script:
-#     - export LANG=C  # Hopefully detect anything relying on locale
-#     - python3 -m pip install ".[test]"
-#     - python3 -m pytest --color yes --verbose --cov=cal_tools --cov=xfel_calibrate
-#   #  Nope... https://docs.gitlab.com/12.10/ee/user/project/merge_requests/test_coverage_visualization.html#enabling-the-feature
-#   #    - coverage xml
-#   #  artifacts:
-#   #    reports:
-#   #      cobertura: coverage.xml
+pytest:
+  stage: test
+  only: [merge_requests]
+  <<: *before_script
+  script:
+    - export LANG=C  # Hopefully detect anything relying on locale
+    - python3 -m pip install ".[test]"
+    - python3 -m pytest --color yes --verbose --cov=cal_tools --cov=xfel_calibrate
+  #  Nope... https://docs.gitlab.com/12.10/ee/user/project/merge_requests/test_coverage_visualization.html#enabling-the-feature
+  #    - coverage xml
+  #  artifacts:
+  #    reports:
+  #      cobertura: coverage.xml
 
 automated_test:
   variables:
@@ -61,7 +61,7 @@ automated_test:
   stage: automated_test
   only: [merge_requests]
   when: manual
-  # allow_failure: true
+  allow_failure: false
   <<: *before_script
   script:
     - export LANG=C  # Hopefully detect anything relying on locale