Projet

Général

Profil

0001-tests-do-not-rely-on-user-database-62192.patch

Emmanuel Cazenave, 06 avril 2022 17:21

Télécharger (2,31 ko)

Voir les différences: 

Subject: [PATCH] tests: do not rely on user database (#62192)


 tests/test_convert_to_sql.py | 2 +-
 tests/utilities.py           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
tests/test_convert_to_sql.py
54 54 

  		




  55
  55
  
    
@pytest.fixture(scope='module')

  		




  56
  56
  
    
def cursor():

  		




  57
  
  
    
    conn = psycopg2.connect(user=os.environ.get('USER'))

  		




  
  57
  
    
    conn = psycopg2.connect(user=os.environ.get('USER'), dbname='postgres')

  		




  58
  58
  
    
    conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)

  		




  59
  59
  
    
    cur = conn.cursor()

  		




  60
  60
  
    
    yield cur

  		












  

    
      tests/utilities.py
    
  





  149
  149
  
    
    os.symlink(os.path.join(os.path.dirname(__file__), 'templates'), os.path.join(pub.app_dir, 'templates'))

  		




  150
  150
  
    

  		




  151
  151
  
    
    if sql_mode:

  		




  152
  
  
    
        conn = psycopg2.connect(user=os.environ['USER'])

  		




  
  152
  
    
        conn = psycopg2.connect(user=os.environ['USER'], dbname='postgres')

  		




  153
  153
  
    
        conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)

  		




  154
  154
  
    
        i = 0

  		




  155
  155
  
    
        while True:

  		




  ......




  199
  199
  
    
        shutil.rmtree(known_elements.sql_app_dir)

  		




  200
  200
  
    
        known_elements.sql_app_dir = None

  		




  201
  201
  
    
    if known_elements.sql_db_name:

  		




  202
  
  
    
        conn = psycopg2.connect(user=os.environ['USER'])

  		




  
  202
  
    
        conn = psycopg2.connect(user=os.environ['USER'], dbname='postgres')

  		




  203
  203
  
    
        conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)

  		




  204
  204
  
    
        try:

  		




  205
  205
  
    
            cur = conn.cursor()

  		




  ......




  215
  215
  
    
    # https://code.djangoproject.com/ticket/22420

  		




  216
  216
  
    
    try:

  		




  217
  217
  
    
        if known_elements.sql_db_name:

  		




  218
  
  
    
            conn = psycopg2.connect(user=os.environ['USER'])

  		




  
  218
  
    
            conn = psycopg2.connect(user=os.environ['USER'], dbname='postgres')

  		




  219
  219
  
    
            cur = conn.cursor()

  		




  220
  220
  
    
            cur.execute(

  		




  221
  221
  
    
                '''SELECT pg_terminate_backend(pg_stat_activity.pid)

  		




  222
  
  
    
-