1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00

Merge pull request #1846 from chrismeyersfsu/fix-1_in_maxint_chance_of_collision

more test fixes
This commit is contained in:
Chris Meyers 2018-05-17 15:04:56 -04:00 committed by GitHub
commit a348893a91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -1,6 +1,7 @@
from django.db import connection from django.db import connection
from django.db.models.signals import post_migrate from django.db.models.signals import post_migrate
from django.apps import apps from django.apps import apps
from django.conf import settings
def app_post_migration(sender, app_config, **kwargs): def app_post_migration(sender, app_config, **kwargs):
@ -17,7 +18,8 @@ def app_post_migration(sender, app_config, **kwargs):
) )
post_migrate.connect(app_post_migration, sender=apps.get_app_config('main')) if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3':
post_migrate.connect(app_post_migration, sender=apps.get_app_config('main'))

View File

@ -90,7 +90,7 @@ def test_cancel_callback_error():
extra_fields = {} extra_fields = {}
status, rc = run.run_pexpect( status, rc = run.run_pexpect(
['ls', '-la'], ['sleep', '2'],
HERE, HERE,
{}, {},
stdout, stdout,