Projet

Général

Profil

0002-make-error_record-resilient-to-None-in-using-arg-337.patch

Emmanuel Cazenave, 02 juillet 2019 19:56

Télécharger (1,9 ko)

Voir les différences: 

Subject: [PATCH 2/2] make error_record resilient to None in 'using' arg
 (#33788)


 django_journal/__init__.py |  6 +++---
 tests/test_main.py         | 12 +++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)
django_journal/__init__.py
70 70 
       when logging in the middle of a transaction which is going to
71 71 
       rollback.
72 72 
    '''
73 
    return record(tag, tpl,
74 
            using=getattr(settings, 'JOURNAL_DB_FOR_ERROR_ALIAS', 'default'),
75 
            **kwargs)
73 
    if kwargs.get('using') is None:
74 
        kwargs['using'] = getattr(settings, 'JOURNAL_DB_FOR_ERROR_ALIAS', 'default')
75 
    return record(tag, tpl, **kwargs)
tests/test_main.py
3 3 
from django.db import transaction
4 4 

  		




  5
  5
  
    

  		




  6
  
  
    
from django_journal import record

  		




  
  6
  
    
from django_journal import record, error_record

  		




  7
  7
  
    
from django_journal.actions import export_as_csv_generator

  		




  8
  8
  
    
from django_journal.models import Journal

  		




  9
  9
  
    

  		




  ......




  53
  53
  
    
        l = list(export_as_csv_generator(qs))

  		




  54
  54
  
    
        self.assertEquals(l[1]['user'], '<deleted>')

  		




  55
  55
  
    

  		




  
  56
  
    

  		




  
  57
  
    
def test_error_record(db):

  		




  
  58
  
    
    error_record('error', 'error message')

  		




  
  59
  
    
    journal = Journal.objects.first()

  		




  
  60
  
    
    assert journal.tag.name == u'error'

  		




  
  61
  
    
    assert journal.message == u'error message'

  		




  
  62
  
    

  		




  
  63
  
    
    # specifying None as database use the defaut one

  		




  
  64
  
    
    error_record('error', 'error message', using=None)

  		




  
  65
  
    
    assert Journal.objects.count() == 2

  		




  56
  
  
    
-