<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18032">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move resource.py to core/<br><br>Change-Id: I0f36a5e61ff0ef14d08165c9c184acdf2d6e6901<br>---<br>M selftest/resource_test.py<br>R src/osmo_gsm_tester/core/resource.py<br>M src/osmo_gsm_tester/suite.py<br>M src/osmo_gsm_tester/test.py<br>4 files changed, 9 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/32/18032/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/selftest/resource_test.py b/selftest/resource_test.py</span><br><span>index ecbeb24..0b9550e 100755</span><br><span>--- a/selftest/resource_test.py</span><br><span>+++ b/selftest/resource_test.py</span><br><span>@@ -6,9 +6,8 @@</span><br><span> import shutil</span><br><span> import atexit</span><br><span> import _prep</span><br><span style="color: hsl(0, 100%, 40%);">-from osmo_gsm_tester.core import config, log, util</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester.core import config, log, util, resource</span><br><span> from osmo_gsm_tester.core.schema import generate_schemas</span><br><span style="color: hsl(0, 100%, 40%);">-from osmo_gsm_tester import resource</span><br><span> </span><br><span> workdir = util.get_tempdir()</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/core/resource.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/resource.py</span><br><span>rename to src/osmo_gsm_tester/core/resource.py</span><br><span>index 7674bff..a1a8ea5 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/core/resource.py</span><br><span>@@ -22,12 +22,12 @@</span><br><span> import atexit</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import config</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import util</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import schema</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log</span><br><span style="color: hsl(120, 100%, 40%);">+from . import config</span><br><span style="color: hsl(120, 100%, 40%);">+from . import util</span><br><span style="color: hsl(120, 100%, 40%);">+from . import schema</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core.util import is_dict, is_list</span><br><span style="color: hsl(120, 100%, 40%);">+from .util import is_dict, is_list</span><br><span> </span><br><span> HASH_KEY = '_hash'</span><br><span> RESERVED_KEY = '_reserved_by'</span><br><span>diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py</span><br><span>index db307ff..c5421c4 100644</span><br><span>--- a/src/osmo_gsm_tester/suite.py</span><br><span>+++ b/src/osmo_gsm_tester/suite.py</span><br><span>@@ -21,7 +21,7 @@</span><br><span> import sys</span><br><span> import time</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import config, log, util, process, schema</span><br><span style="color: hsl(120, 100%, 40%);">+from .core import config, log, util, process, schema, resource</span><br><span> from .core.event_loop import MainLoop</span><br><span> 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</span><br><span> from .obj import run_node</span><br><span>@@ -29,7 +29,7 @@</span><br><span> from .obj import enb</span><br><span> from .obj import bts</span><br><span> from .obj import ms</span><br><span style="color: hsl(0, 100%, 40%);">-from . import resource, test</span><br><span style="color: hsl(120, 100%, 40%);">+from . import test</span><br><span> </span><br><span> class Timeout(Exception):</span><br><span>     pass</span><br><span>diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py</span><br><span>index 64b45c5..ec81d7d 100644</span><br><span>--- a/src/osmo_gsm_tester/test.py</span><br><span>+++ b/src/osmo_gsm_tester/test.py</span><br><span>@@ -23,8 +23,7 @@</span><br><span> import traceback</span><br><span> from . import testenv</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util</span><br><span style="color: hsl(0, 100%, 40%);">-from . import resource</span><br><span style="color: hsl(120, 100%, 40%);">+from .core import log, util, resource</span><br><span> </span><br><span> class Test(log.Origin):</span><br><span>     UNKNOWN = 'UNKNOWN' # matches junit 'error'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18032">change 18032</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18032"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0f36a5e61ff0ef14d08165c9c184acdf2d6e6901 </div>
<div style="display:none"> Gerrit-Change-Number: 18032 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>