Revert "Merge branch 'unstable'"

This reverts commit 929c337e8b, reversing
changes made to b9bc73fd01.

tests/handlers/api/base.py

@@ -44,7 +44,7 @@ class Query:
     def delete(self, path, **kwargs):
         return self._fetch("DELETE", path, **kwargs)
 
-    def get_url(self, path, version):
+    def _get_url(self, path, version):
         if version is None:
             return "http://{}:{}{}".format(self._host, self._port, path)
         return "http://{}:{}/v{}{}".format(self._host, self._port, version, path)
@@ -62,7 +62,7 @@ class Query:
 
         @asyncio.coroutine
         def go(future):
-            response = yield from aiohttp.request(method, self.get_url(path, api_version), data=body)
+            response = yield from aiohttp.request(method, self._get_url(path, api_version), data=body)
             future.set_result(response)
         future = asyncio.Future()
         asyncio.async(go(future))

tests/handlers/api/test_dynamips.py

@@ -16,10 +16,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
-import os
-import stat
-from unittest.mock import patch
-
 from tests.utils import asyncio_patch
 
 
@@ -127,22 +123,3 @@ from tests.utils import asyncio_patch
 #     assert response.status == 200
 #     assert response.json["name"] == "test"
 #     assert response.json["console"] == free_console_port
-
-
-@pytest.fixture
-def fake_dynamips(tmpdir):
-    """Create a fake IOU image on disk"""
-
-    path = str(tmpdir / "7200.bin")
-    with open(path, "w+") as f:
-        f.write('1')
-    os.chmod(path, stat.S_IREAD)
-    return path
-
-
-def test_vms(server, tmpdir, fake_dynamips):
-
-    with patch("gns3server.modules.Dynamips.get_images_directory", return_value=str(tmpdir), example=True):
-        response = server.get("/dynamips/vms")
-    assert response.status == 200
-    assert response.json == [{"filename": "7200.bin"}]

tests/handlers/api/test_file.py

@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2015 GNS3 Technologies Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""
-This test suite check /files endpoint
-"""
-
-import json
-import asyncio
-import aiohttp
-
-from gns3server.version import __version__
-
-
-def test_stream(server, tmpdir, loop):
-    with open(str(tmpdir / "test"), 'w+') as f:
-        f.write("hello")
-
-    def go(future):
-        query = json.dumps({"location": str(tmpdir / "test")})
-        headers = {'content-type': 'application/json'}
-        response = yield from aiohttp.request("GET", server.get_url("/files/stream", 1), data=query, headers=headers)
-        response.body = yield from response.content.read(5)
-        with open(str(tmpdir / "test"), 'a') as f:
-            f.write("world")
-        response.body += yield from response.content.read(5)
-        response.close()
-        future.set_result(response)
-
-    future = asyncio.Future()
-    asyncio.async(go(future))
-    response = loop.run_until_complete(future)
-    assert response.status == 200
-    assert response.body == b'helloworld'
-
-
-def test_stream_file_not_found(server, tmpdir, loop):
-    def go(future):
-        query = json.dumps({"location": str(tmpdir / "test")})
-        headers = {'content-type': 'application/json'}
-        response = yield from aiohttp.request("GET", server.get_url("/files/stream", 1), data=query, headers=headers)
-        response.close()
-        future.set_result(response)
-
-    future = asyncio.Future()
-    asyncio.async(go(future))
-    response = loop.run_until_complete(future)
-    assert response.status == 404

tests/handlers/api/test_iou.py

@@ -309,11 +309,3 @@ def test_get_initial_config_with_config_file(server, project, vm):
     response = server.get("/projects/{project_id}/iou/vms/{vm_id}/initial_config".format(project_id=vm["project_id"], vm_id=vm["vm_id"]), example=True)
     assert response.status == 200
     assert response.json["content"] == "TEST"
-
-
-def test_vms(server, vm, tmpdir, fake_iou_bin):
-
-    with patch("gns3server.modules.IOU.get_images_directory", return_value=str(tmpdir), example=True):
-        response = server.get("/iou/vms")
-    assert response.status == 200
-    assert response.json == [{"filename": "iou.bin"}]

tests/handlers/api/test_qemu.py

@@ -32,32 +32,12 @@ def fake_qemu_bin():
     return bin_path
 
 
-@pytest.fixture
-def fake_qemu_vm(tmpdir):
-
-    bin_path = os.path.join(str(tmpdir / "linux.img"))
-    with open(bin_path, "w+") as f:
-        f.write("1")
-    os.chmod(bin_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
-    return bin_path
-
-
 @pytest.fixture
 def base_params(tmpdir, fake_qemu_bin):
     """Return standard parameters"""
     return {"name": "PC TEST 1", "qemu_path": fake_qemu_bin}
 
 
-@pytest.fixture
-def fake_qemu_bin():
-
-    bin_path = os.path.join(os.environ["PATH"], "qemu_x42")
-    with open(bin_path, "w+") as f:
-        f.write("1")
-    os.chmod(bin_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
-    return bin_path
-
-
 @pytest.fixture
 def vm(server, project, base_params):
     response = server.post("/projects/{project_id}/qemu/vms".format(project_id=project.id), base_params)
@@ -192,11 +172,3 @@ def test_qemu_list_binaries(server, vm):
         assert mock.called
         assert response.status == 200
         assert response.json == ret
-
-
-def test_vms(server, tmpdir, fake_qemu_vm):
-
-    with patch("gns3server.modules.Qemu.get_images_directory", return_value=str(tmpdir), example=True):
-        response = server.get("/qemu/vms")
-    assert response.status == 200
-    assert response.json == [{"filename": "linux.img"}]