Move resource.py to core/
Change-Id: I0f36a5e61ff0ef14d08165c9c184acdf2d6e6901
This commit is contained in:
parent
1ee5ec5db2
commit
06cb536826
|
@ -6,9 +6,8 @@ import pprint
|
||||||
import shutil
|
import shutil
|
||||||
import atexit
|
import atexit
|
||||||
import _prep
|
import _prep
|
||||||
from osmo_gsm_tester.core import config, log, util
|
from osmo_gsm_tester.core import config, log, util, resource
|
||||||
from osmo_gsm_tester.core.schema import generate_schemas
|
from osmo_gsm_tester.core.schema import generate_schemas
|
||||||
from osmo_gsm_tester import resource
|
|
||||||
|
|
||||||
workdir = util.get_tempdir()
|
workdir = util.get_tempdir()
|
||||||
|
|
||||||
|
|
|
@ -22,12 +22,12 @@ import copy
|
||||||
import atexit
|
import atexit
|
||||||
import pprint
|
import pprint
|
||||||
|
|
||||||
from .core import log
|
from . import log
|
||||||
from .core import config
|
from . import config
|
||||||
from .core import util
|
from . import util
|
||||||
from .core import schema
|
from . import schema
|
||||||
|
|
||||||
from .core.util import is_dict, is_list
|
from .util import is_dict, is_list
|
||||||
|
|
||||||
HASH_KEY = '_hash'
|
HASH_KEY = '_hash'
|
||||||
RESERVED_KEY = '_reserved_by'
|
RESERVED_KEY = '_reserved_by'
|
|
@ -21,7 +21,7 @@ import os
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
import pprint
|
import pprint
|
||||||
from .core import config, log, util, process, schema
|
from .core import config, log, util, process, schema, resource
|
||||||
from .core.event_loop import MainLoop
|
from .core.event_loop import MainLoop
|
||||||
from .obj import nitb_osmo, hlr_osmo, mgcpgw_osmo, mgw_osmo, msc_osmo, bsc_osmo, stp_osmo, ggsn_osmo, sgsn_osmo, esme, osmocon, ms_driver, iperf3
|
from .obj import nitb_osmo, hlr_osmo, mgcpgw_osmo, mgw_osmo, msc_osmo, bsc_osmo, stp_osmo, ggsn_osmo, sgsn_osmo, esme, osmocon, ms_driver, iperf3
|
||||||
from .obj import run_node
|
from .obj import run_node
|
||||||
|
@ -29,7 +29,7 @@ from .obj import epc
|
||||||
from .obj import enb
|
from .obj import enb
|
||||||
from .obj import bts
|
from .obj import bts
|
||||||
from .obj import ms
|
from .obj import ms
|
||||||
from . import resource, test
|
from . import test
|
||||||
|
|
||||||
class Timeout(Exception):
|
class Timeout(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -23,8 +23,7 @@ import time
|
||||||
import traceback
|
import traceback
|
||||||
from . import testenv
|
from . import testenv
|
||||||
|
|
||||||
from .core import log, util
|
from .core import log, util, resource
|
||||||
from . import resource
|
|
||||||
|
|
||||||
class Test(log.Origin):
|
class Test(log.Origin):
|
||||||
UNKNOWN = 'UNKNOWN' # matches junit 'error'
|
UNKNOWN = 'UNKNOWN' # matches junit 'error'
|
||||||
|
|
Loading…
Reference in New Issue