misc: fix test failures with pytest's --reuse-db param (#36608)

This commit is contained in:
Lauréline Guérin 2019-10-14 14:47:35 +02:00
parent 7a7b3d3e7e
commit d25d78f615
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
2 changed files with 9 additions and 5 deletions

View File

@ -107,8 +107,9 @@ def test_ws_link_created(app, genesys):
'password': 'xyz',
'email': 'john.doe@example.com'
}))
link = Link.objects.latest('pk')
assert response.json['err'] == 0
assert response.json['link_id'] == 1
assert response.json['link_id'] == link.pk
assert response.json['new']
assert Link.objects.filter(
name_id='zob', id_per='789', resource=genesys).count() == 1

View File

@ -77,8 +77,9 @@ def test_create_demand(app, resource, freezer, sftpserver):
assert resource.form_set.filter(status='new').count() == 1
form = resource.form_set.get(status='new')
assert len(form.demand_data) == 2
expected_filename = '%s%s-4200142.csv' % (resource.output_files_prefix,
timestamp.strftime('%y%m%d-%H%M%S'))
expected_filename = '%s%s-%s.csv' % (resource.output_files_prefix,
timestamp.strftime('%y%m%d-%H%M%S'),
form.get_gesbac_id())
assert response.json['data']['filename'] == expected_filename
assert resource.form_set.filter(status='new').count() == 1
with sftpserver.serve_content({'output': {expected_filename: 'content'}}):
@ -90,8 +91,10 @@ def test_create_demand(app, resource, freezer, sftpserver):
assert resource.form_set.filter(status='new').count() == 1
form = resource.form_set.get(status='new')
assert len(form.demand_data) == 2
assert response.json['data']['filename'] == '%s%s-4200242.csv' % (resource.output_files_prefix,
timestamp.strftime('%y%m%d-%H%M%S'))
expected_filename = '%s%s-%s.csv' % (resource.output_files_prefix,
timestamp.strftime('%y%m%d-%H%M%S'),
form.get_gesbac_id())
assert response.json['data']['filename'] == expected_filename
with sftpserver.serve_content({'output': {response.json['data']['filename']: 'content'}}):
resource.jobs()
assert resource.form_set.filter(status='sent').count() == 2