0002-Fix-hobo-tests-under-django-3.2.patch

A. Berriot, 13 octobre 2022 15:25

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/5] Fix hobo tests under django 3.2

 hobo/environment/models.py     | 36 ++++++++++++++++++++--------------
 hobo/environment/validators.py |  7 +++----
 tests/test_cook.py             | 17 ++++++++--------
 tests/test_environment.py      |  5 +++--
 tests/test_theme.py            |  2 +-
 5 files changed, 37 insertions(+), 30 deletions(-)

             self._parse_value_as_json()
     def is_resolvable(url):
         try:
             netloc = urllib.parse.urlparse(url).netloc
             if netloc and socket.gethostbyname(netloc):
                 return True
         except socket.gaierror:
             return False
     def has_valid_certificate(url):
         try:
             requests.get(url, timeout=5, verify=True, allow_redirects=False)
             return True
         except requests.exceptions.SSLError:
             return False
         except requests.exceptions.ConnectionError:
             return False
     class ServiceBase(models.Model):
         class Meta:
             abstract = True
-...
             return self.get_base_url_path() + '__provision__/'
         def is_resolvable(self):
             try:
                 netloc = urllib.parse.urlparse(self.base_url).netloc
                 if netloc and socket.gethostbyname(netloc):
                     return True
             except socket.gaierror:
                 return False
             return is_resolvable(self.base_url)
         def has_valid_certificate(self):
             if not self.is_resolvable():
                 return False
             try:
                 requests.get(self.base_url, timeout=5, verify=True, allow_redirects=False)
                 return True
             except requests.exceptions.SSLError:
                 return False
             except requests.exceptions.ConnectionError:
                 return False
             return has_valid_certificate(self.base_url)
         def is_running(self):
             if not self.is_resolvable():

     from django.core.exceptions import ValidationError
     from django.utils.translation import gettext_lazy as _
     from hobo.environment.models import ServiceBase
     from hobo.environment import models
     def validate_service_url(url):
         service = ServiceBase(title='dummy', base_url=url)
         if not service.is_resolvable():
         if not models.is_resolvable(url):
             raise ValidationError(
                 _('Error: %(netloc)s is not resolvable in URL %(url)s'),
                 code='not-resolvable',
                 params={'netloc': urllib.parse.urlsplit(url).netloc, 'url': url},
+            )
         if not service.has_valid_certificate():
         if not models.has_valid_certificate(url):
             raise ValidationError(
                 _('Error: no valid certificate for %(url)s'), code='invalid-certificate', params={'url': url}
+            )

     from django.contrib.contenttypes.models import ContentType
     from django.core.management.base import CommandError
     from hobo.environment import models as environment_models
     from hobo.environment.management.commands.cook import Command
     from hobo.environment.models import (
         Authentic,
-...
         command.server_action = 'mock a server_action handler (ex: hobo-create)'
         action, action_args = 'server-action', {'url': 'https://test.org/'}
         monkeypatch.setattr(ServiceBase, 'is_resolvable', lambda x: True)
         monkeypatch.setattr(ServiceBase, 'has_valid_certificate', lambda x: True)
         monkeypatch.setattr(environment_models, 'is_resolvable', lambda x: True)
         monkeypatch.setattr(environment_models, 'has_valid_certificate', lambda x: True)
         command.check_action(action, action_args)
         assert True
-...
         command.server_action = 'mock a server_action handler (ex: hobo-create)'
         action, action_args = 'not-a-server-action', {'url': 'https://test.org/'}
         monkeypatch.setattr(ServiceBase, 'is_resolvable', lambda x: True)
         monkeypatch.setattr(ServiceBase, 'has_valid_certificate', lambda x: True)
         monkeypatch.setattr(environment_models, 'is_resolvable', lambda x: True)
         monkeypatch.setattr(environment_models, 'has_valid_certificate', lambda x: True)
         with pytest.raises(CommandError) as e_info:
             command.check_action(action, action_args)
         assert 'Unknown action not-a-server-action' in str(e_info.value)
-...
         command.server_action = 'mock a server_action handler (ex: hobo-create)'
         action, action_args = 'server-action', {'url': 'https://test.org/'}
         monkeypatch.setattr(ServiceBase, 'is_resolvable', lambda x: False)
         monkeypatch.setattr(ServiceBase, 'has_valid_certificate', lambda x: True)
         monkeypatch.setattr(environment_models, 'is_resolvable', lambda x: False)
         monkeypatch.setattr(environment_models, 'has_valid_certificate', lambda x: True)
         with pytest.raises(CommandError) as e_info:
             command.check_action(action, action_args)
         assert 'test.org is not resolvable in URL https://test.org/' in str(e_info.value)
-...
         command.server_action = 'mock a server_action handler (ex: hobo-create)'
         action, action_args = 'server-action', {'url': 'https://test.org/'}
         monkeypatch.setattr(ServiceBase, 'is_resolvable', lambda x: True)
         monkeypatch.setattr(ServiceBase, 'has_valid_certificate', lambda x: False)
         monkeypatch.setattr(environment_models, 'is_resolvable', lambda x: True)
         monkeypatch.setattr(environment_models, 'has_valid_certificate', lambda x: False)
         with pytest.raises(CommandError) as e_info:
             command.check_action(action, action_args)
         assert 'no valid certificate for https://test.org/' in str(e_info.value)

     from test_manager import login
     from webtest import Upload
     from hobo.environment import models as environment_models
     from hobo.environment.models import AVAILABLE_SERVICES, Combo, Passerelle, ServiceBase, Variable
     from hobo.environment.utils import get_installed_services_dict
     from hobo.profile.models import AttributeDefinition
-...
         response = form.submit()
         assert 'not resolvable' in response
         monkeypatch.setattr(ServiceBase, 'is_resolvable', lambda x: True)
         monkeypatch.setattr(environment_models, 'is_resolvable', lambda x: True)
         form = response.form
         response = form.submit()
         assert 'no valid certificate' in response
         assert not Combo.objects.exists()
         monkeypatch.setattr(ServiceBase, 'has_valid_certificate', lambda x: True)
         monkeypatch.setattr(environment_models, 'has_valid_certificate', lambda x: True)
         form = response.form
         response = form.submit()
         assert Combo.objects.exists()

         assert Variable.objects.filter(name='theme')[0].value == 'alfortville'
         assert Variable.objects.filter(name='foo')[0].value == 'bar'
         assert resp.location == '/theme/'
         assert "The theme has been changed" in dict(resp.headers)['Set-Cookie']
         resp = resp.follow()
         assert "The theme has been changed" in str(resp.html)
         assert resp.form['theme'].value == 'alfortville'
         resp.form['theme'].value = 'publik'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Hobo

0002-Fix-hobo-tests-under-django-3.2.patch