arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-25 00:08:11 +00:00
Code Issues Releases Wiki Activity

Try to fix tests

Browse Source
This commit is contained in:
grossmj 2022-12-30 10:35:29 +08:00
parent 3804249d89
commit b8d595928b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/controller/__init__.py
View File

@ -41,6 +41,7 @@ from ..version import __version__
from .topology import load_topology from .topology import load_topology
from .gns3vm import GNS3VM from .gns3vm import GNS3VM
from .gns3vm.gns3_vm_error import GNS3VMError from .gns3vm.gns3_vm_error import GNS3VMError
from gns3server import configs as gns3_configs
import logging import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -288,7 +289,7 @@ class Controller:
if not os.path.exists(os.path.join(dst_path, filename)): if not os.path.exists(os.path.join(dst_path, filename)):
shutil.copy(os.path.join(resource_path, filename), os.path.join(dst_path, filename)) shutil.copy(os.path.join(resource_path, filename), os.path.join(dst_path, filename))
else: else:
for entry in importlib_resources.files('gns3server.configs').iterdir(): for entry in importlib_resources.files(gns3_configs).iterdir():
if entry.is_file(): if entry.is_file():
full_path = os.path.join(dst_path, entry.name) full_path = os.path.join(dst_path, entry.name)
if not os.path.exists(full_path): if not os.path.exists(full_path):

3
gns3server/controller/appliance_manager.py
View File

@ -32,6 +32,7 @@ except ImportError:
from .appliance import Appliance from .appliance import Appliance
from ..config import Config from ..config import Config
from ..utils.asyncio import locking from ..utils.asyncio import locking
from gns3server import appliances as gns3_appliances
import logging import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -104,7 +105,7 @@ class ApplianceManager:
if not os.path.exists(os.path.join(dst_path, filename)): if not os.path.exists(os.path.join(dst_path, filename)):
shutil.copy(os.path.join(resource_path, filename), os.path.join(dst_path, filename)) shutil.copy(os.path.join(resource_path, filename), os.path.join(dst_path, filename))
else: else:
for entry in importlib_resources.files('gns3server.appliances').iterdir(): for entry in importlib_resources.files(gns3_appliances).iterdir():
if entry.is_file(): if entry.is_file():
full_path = os.path.join(dst_path, entry.name) full_path = os.path.join(dst_path, entry.name)
if not os.path.exists(full_path): if not os.path.exists(full_path):