From ee986a29ac3228b8ca271568af89b85ad5c59228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20M=C3=A9nager?= <herve.menager@pasteur.fr> Date: Tue, 8 Dec 2020 21:44:45 +0100 Subject: [PATCH] skip more tests if remote resources unavailable --- ippisite/ippidb/tests/tests.py | 4 ++-- ippisite/ippidb/tests/tests_contribute.py | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ippisite/ippidb/tests/tests.py b/ippisite/ippidb/tests/tests.py index b38c3d41..06aaa375 100644 --- a/ippisite/ippidb/tests/tests.py +++ b/ippisite/ippidb/tests/tests.py @@ -3,7 +3,7 @@ iPPI-DB unit tests """ import json import re -from ssl import SSLError +import requests.exceptions.SSLError from django.contrib.auth import get_user_model from django.core.management import call_command @@ -773,7 +773,7 @@ class TestConvertSMILESToIUPAC(TestCase): self.assertEqual( convert_smiles_to_iupac(smiles).lower(), expected_iupac.lower() ) - except SSLError: + except requests.exceptions.SSLError: self.skipTest("SSL connection issue with the CACTUS WS, skipping") diff --git a/ippisite/ippidb/tests/tests_contribute.py b/ippisite/ippidb/tests/tests_contribute.py index 4638c657..41860a63 100644 --- a/ippisite/ippidb/tests/tests_contribute.py +++ b/ippisite/ippidb/tests/tests_contribute.py @@ -1,6 +1,8 @@ """ iPPI-DB contribution module tests """ +import requests.exceptions.HTTPError + from django.contrib.auth import get_user_model from django.contrib.auth.models import Permission from django.contrib.contenttypes.models import ContentType @@ -22,7 +24,10 @@ class BibliographyIDTestCase(TestCase): b = models.Bibliography() b.source = "DO" b.id_source = "10.1016/j.bmcl.2013.03.013" - b.save(autofill=True) + try: + b.save(autofill=True) + except requests.exceptions.HTTPError: + self.skipTest("Connection error, skipping test") class ContributionViewsAccessTestCase(TestCase): -- GitLab