This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18032 ) Change subject: Move resource.py to core/ ...................................................................... Move resource.py to core/ Change-Id: I0f36a5e61ff0ef14d08165c9c184acdf2d6e6901 --- M selftest/resource_test.py R src/osmo_gsm_tester/core/resource.py M src/osmo_gsm_tester/suite.py M src/osmo_gsm_tester/test.py 4 files changed, 9 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/32/18032/1 diff --git a/selftest/resource_test.py b/selftest/resource_test.py index ecbeb24..0b9550e 100755 --- a/selftest/resource_test.py +++ b/selftest/resource_test.py @@ -6,9 +6,8 @@ import shutil import atexit 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 import resource workdir = util.get_tempdir() diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/core/resource.py similarity index 99% rename from src/osmo_gsm_tester/resource.py rename to src/osmo_gsm_tester/core/resource.py index 7674bff..a1a8ea5 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/core/resource.py @@ -22,12 +22,12 @@ import atexit import pprint -from .core import log -from .core import config -from .core import util -from .core import schema +from . import log +from . import config +from . import util +from . import schema -from .core.util import is_dict, is_list +from .util import is_dict, is_list HASH_KEY = '_hash' RESERVED_KEY = '_reserved_by' diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index db307ff..c5421c4 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -21,7 +21,7 @@ import sys import time 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 .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 @@ -29,7 +29,7 @@ from .obj import enb from .obj import bts from .obj import ms -from . import resource, test +from . import test class Timeout(Exception): pass diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py index 64b45c5..ec81d7d 100644 --- a/src/osmo_gsm_tester/test.py +++ b/src/osmo_gsm_tester/test.py @@ -23,8 +23,7 @@ import traceback from . import testenv -from .core import log, util -from . import resource +from .core import log, util, resource class Test(log.Origin): UNKNOWN = 'UNKNOWN' # matches junit 'error' -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I0f36a5e61ff0ef14d08165c9c184acdf2d6e6901 Gerrit-Change-Number: 18032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200504/bf49f6a0/attachment.htm>