Cleanup tests around port name

tests/controller/test_node_port_name.py

@@ -22,6 +22,7 @@ from tests.utils import AsyncioMagicMock
 
 from gns3server.controller.node import Node
 from gns3server.controller.project import Project
+from gns3server.controller.ports.ethernet_port import EthernetPort
 
 
 @pytest.fixture
@@ -135,7 +136,7 @@ def test_list_ports_adapters_cloud(project, compute):
     assert node.__json__()["ports"] == [
         {
             "name": "eth0",
-            "short_name": "e0/0",
+            "short_name": "eth0",
             "data_link_types": {"Ethernet": "DLT_EN10MB"},
             "port_number": 0,
             "adapter_number": 0,
@@ -548,3 +549,10 @@ def test_list_ports_dynamips(project, compute):
             "link_type": "serial"
         }
     ]
+
+
+def test_short_name():
+    # If no customization of port name format return the default short name
+    assert EthernetPort("Ethernet0", 0, 0, 0).short_name == "e0/0"
+    # If port name format has change we use the port name as the short name (1.X behavior)
+    assert EthernetPort("eth0", 0, 0, 0).short_name == "eth0"

tests/controller/test_port.py

@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2016 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/>.
-
-from gns3server.controller.ports.ethernet_port import EthernetPort
-
-
-def test_short_name():
-    # If no customization of port name format return the default short name
-    assert EthernetPort("Ethernet0", 0, 0, 0).short_name == "e0/0"
-    # If port name format has change we use the port name as the short name (1.X behavior)
-    assert EthernetPort("eth0", 0, 0, 0).short_name == "eth0"