Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py

tests/handlers/api/compute/test_project.py

@@ -36,6 +36,16 @@ def test_create_project_with_path(http_compute, tmpdir):
         assert response.json["project_id"] == "00010203-0405-0607-0809-0a0b0c0d0e0f"
 
 
+def test_create_project_with_path_and_empty_variables(http_compute, tmpdir):
+    with patch("gns3server.compute.project.Project.is_local", return_value=True):
+        response = http_compute.post("/projects", {
+            "name": "test",
+            "path": str(tmpdir), "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0f",
+            "variables": None})
+        assert response.status == 201
+        assert response.json["project_id"] == "00010203-0405-0607-0809-0a0b0c0d0e0f"
+
+
 def test_create_project_without_dir(http_compute):
     query = {"name": "test", "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f"}
     response = http_compute.post("/projects", query, example=True)

tests/handlers/api/compute/test_vmware.py

@@ -20,7 +20,7 @@ from tests.utils import asyncio_patch
 from unittest.mock import patch
 
 
-@pytest.yield_fixture(scope="function")
+@pytest.fixture(scope="function")
 def vm(http_compute, project, vmx_path):
 
     with asyncio_patch("gns3server.compute.vmware.vmware_vm.VMwareVM.create", return_value=True) as mock:
@@ -33,7 +33,7 @@ def vm(http_compute, project, vmx_path):
     return response.json
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def vmx_path(tmpdir):
     """
     Return a fake VMX file