refactoring

frameworks/VboxMachine/VboxMachine.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from VBoxWrapper import VirtualMachine
 
-from frameworks import vm_is_turn_on
+from frameworks.decorators import vm_is_turn_on
 from .vm_data import VmData
 from .configs import VmConfig
 

frameworks/__init__.py

@@ -1,15 +1,11 @@
 # -*- coding: utf-8 -*-
 from .VboxMachine import VboxMachine, VmConfig
-from console import MyConsole
-from .decorators import vm_data_created, vm_is_turn_on, retry
+from .console import MyConsole
 from .report import Report
 
 __all__ = [
     VboxMachine,
     MyConsole,
     Report,
-    VmConfig,
-    'vm_data_created',
-    'vm_is_turn_on',
-    'retry'
+    VmConfig
 ]

tests/desktop_tests/tools/test_tools.py

@@ -8,7 +8,8 @@
 from host_tools import File, Dir
 from ssh_wrapper import Ssh, Sftp, ServerData
 
-from frameworks import VboxMachine, MyConsole, retry, vm_data_created
+from frameworks.decorators import retry, vm_data_created
+from frameworks import VboxMachine, MyConsole
 from .desktop_report import DesktopReport
 from .paths import Paths
 from .ssh_connection import SSHConnection