From 39e069e1e8cbaced0e54f97f9443bc847bfc5caa Mon Sep 17 00:00:00 2001
From: leufen1 <l.leufen@fz-juelich.de>
Date: Fri, 19 Feb 2021 10:10:12 +0100
Subject: [PATCH] try if it works for tests from scratch and gpu too
---
.gitlab-ci.yml | 16 ++++++++--------
conftest.py | 5 ++++-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75a77bb3..7951b95c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,10 +30,10 @@ tests (from scratch):
- base
- zam347
stage: test
- only:
- - master
- - /^release.*$/
- - develop
+ # only:
+ # - master
+ # - /^release.*$/
+ # - develop
variables:
FAILURE_THRESHOLD: 100
TEST_TYPE: "scratch"
@@ -61,10 +61,10 @@ tests (on GPU):
- gpu
- zam347
stage: test
- only:
- - master
- - /^release.*$/
- - develop
+ # only:
+ # - master
+ # - /^release.*$/
+ # - develop
variables:
FAILURE_THRESHOLD: 100
TEST_TYPE: "gpu"
diff --git a/conftest.py b/conftest.py
index 08641ff3..85f31b71 100644
--- a/conftest.py
+++ b/conftest.py
@@ -62,6 +62,9 @@ def default_session_fixture(request):
patched.__enter__()
def unpatch():
- patched.__exit__()
+ try:
+ patched.__exit__()
+ except IndexError:
+ pass
request.addfinalizer(unpatch)
--
GitLab