Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-06-02 13:47:40 +02:00
commit cb7dbfb256
9 files changed
+110 -25

No files matched your search

+4 -3
View File
@@ -129,6 +129,9 @@ def test_commit(manager, loop):
def test_commit_permission_issue(manager, loop):
"""
GNS3 will fix the permission and continue to delete
"""
project = Project(project_id=str(uuid4()))
node = VPCSVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager)
project.add_node(node)
@@ -137,9 +140,7 @@ def test_commit_permission_issue(manager, loop):
assert len(project._nodes_to_destroy) == 1
assert os.path.exists(directory)
os.chmod(directory, 0)
with pytest.raises(aiohttp.web.HTTPInternalServerError):
loop.run_until_complete(asyncio.async(project.commit()))
os.chmod(directory, 700)
loop.run_until_complete(asyncio.async(project.commit()))
def test_project_delete(loop):