Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/version.py
#	requirements.txt

tests/controller/test_compute.py

@@ -295,8 +295,8 @@ def test_streamFile(project, async_run, compute):
     response = MagicMock()
     response.status = 200
     with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
-        async_run(compute.stream_file(project, "test/titi"))
-    mock.assert_called_with("GET", "https://example.com:84/v2/compute/projects/{}/stream/test/titi".format(project.id), auth=None, timeout=None)
+        async_run(compute.stream_file(project, "test/titi", timeout=120))
+    mock.assert_called_with("GET", "https://example.com:84/v2/compute/projects/{}/stream/test/titi".format(project.id), auth=None, timeout=120)
 
 
 def test_downloadFile(project, async_run, compute):
@@ -380,7 +380,7 @@ def test_list_files(project, async_run, compute):
     response.status = 200
     with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
         assert async_run(compute.list_files(project)) == res
-        mock.assert_any_call("GET", "https://example.com:84/v2/compute/projects/{}/files".format(project.id), auth=None, chunked=None, data=None, headers={'content-type': 'application/json'}, timeout=120)
+        mock.assert_any_call("GET", "https://example.com:84/v2/compute/projects/{}/files".format(project.id), auth=None, chunked=None, data=None, headers={'content-type': 'application/json'}, timeout=None)
 
 
 def test_interfaces(project, async_run, compute):

tests/controller/test_link.py

@@ -98,7 +98,7 @@ def test_add_node(async_run, project, compute):
 
     assert link.create.called
     link._project.controller.notification.emit.assert_called_with("link.created", link.__json__())
-    assert link in node2.link
+    assert link in node2.links
 
 
 def test_add_node_already_connected(async_run, project, compute):
@@ -348,10 +348,10 @@ def test_delete(async_run, project, compute):
     node2._ports = [EthernetPort("E0", 0, 0, 4)]
     async_run(link.add_node(node2, 0, 4))
 
-    assert link in node2.link
+    assert link in node2.links
 
     async_run(link.delete())
-    assert link not in node2.link
+    assert link not in node2.links
 
 
 def test_update_filters(async_run, project, compute):