Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-05-02 16:59:56 +02:00
commit 98b32cd9e2
8 files changed
+180 -64

No files matched your search

+2 -2
View File
@@ -245,8 +245,8 @@ def test_export(http_compute, tmpdir, loop, project):
response = http_compute.get("/projects/{project_id}/export".format(project_id=project.id), raw=True)
assert response.status == 200
assert response.headers['CONTENT-TYPE'] == 'application/gns3z'
assert response.headers['CONTENT-DISPOSITION'] == 'attachment; filename="{}.gns3z"'.format(project.name)
assert response.headers['CONTENT-TYPE'] == 'application/gns3project'
assert response.headers['CONTENT-DISPOSITION'] == 'attachment; filename="{}.gns3project"'.format(project.name)
with open(str(tmpdir / 'project.zip'), 'wb+') as f:
f.write(response.body)