<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18033">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move test.py and report.py to core/<br><br>Change-Id: Ibb7fa5ab40bcf1e59705bdd2c2c5a76025b2b544<br>---<br>M selftest/suite_test.py<br>R src/osmo_gsm_tester/core/report.py<br>R src/osmo_gsm_tester/core/test.py<br>M src/osmo_gsm_tester/suite.py<br>M src/osmo_gsm_tester/testenv.py<br>M src/osmo_gsm_tester/trial.py<br>6 files changed, 20 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/selftest/suite_test.py b/selftest/suite_test.py</span><br><span>index 1fb95ec..560ca50 100755</span><br><span>--- a/selftest/suite_test.py</span><br><span>+++ b/selftest/suite_test.py</span><br><span>@@ -2,9 +2,9 @@</span><br><span> import os</span><br><span> import _prep</span><br><span> import shutil</span><br><span style="color: hsl(0, 100%, 40%);">-from osmo_gsm_tester.core import log, config, util</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester.core import log, config, util, report</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 suite, report</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester import suite</span><br><span> </span><br><span> config.ENV_CONF = './suite_test'</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/report.py b/src/osmo_gsm_tester/core/report.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/report.py</span><br><span>rename to src/osmo_gsm_tester/core/report.py</span><br><span>diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/core/test.py</span><br><span>similarity index 94%</span><br><span>rename from src/osmo_gsm_tester/test.py</span><br><span>rename to src/osmo_gsm_tester/core/test.py</span><br><span>index ec81d7d..93dbf6a 100644</span><br><span>--- a/src/osmo_gsm_tester/test.py</span><br><span>+++ b/src/osmo_gsm_tester/core/test.py</span><br><span>@@ -21,9 +21,9 @@</span><br><span> import sys</span><br><span> import time</span><br><span> import traceback</span><br><span style="color: hsl(0, 100%, 40%);">-from . import testenv</span><br><span style="color: hsl(120, 100%, 40%);">+from .. import testenv</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, resource</span><br><span style="color: hsl(120, 100%, 40%);">+from . 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>@@ -56,11 +56,7 @@</span><br><span> log.large_separator(self.suite_run.trial.name(), self.suite_run.name(), self.name(), sublevel=3)</span><br><span> self.status = Test.UNKNOWN</span><br><span> self.start_timestamp = time.time()</span><br><span style="color: hsl(0, 100%, 40%);">- from .core import process</span><br><span style="color: hsl(0, 100%, 40%);">- from .core.event_loop import MainLoop</span><br><span style="color: hsl(0, 100%, 40%);">- from .obj import sms</span><br><span style="color: hsl(0, 100%, 40%);">- from . import suite</span><br><span style="color: hsl(0, 100%, 40%);">- testenv.setup(self.suite_run, self, suite, MainLoop, sms, process)</span><br><span style="color: hsl(120, 100%, 40%);">+ testenv.setup(self.suite_run, self)</span><br><span> with self.redirect_stdout():</span><br><span> util.run_python_file('%s.%s' % (self.suite_run.definition.name(), self.basename),</span><br><span> self.path)</span><br><span>diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py</span><br><span>index c5421c4..6952fd2 100644</span><br><span>--- a/src/osmo_gsm_tester/suite.py</span><br><span>+++ b/src/osmo_gsm_tester/suite.py</span><br><span>@@ -22,6 +22,7 @@</span><br><span> import time</span><br><span> import pprint</span><br><span> from .core import config, log, util, process, schema, resource</span><br><span style="color: hsl(120, 100%, 40%);">+from .core import test</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 +30,6 @@</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 test</span><br><span> </span><br><span> class Timeout(Exception):</span><br><span> pass</span><br><span>diff --git a/src/osmo_gsm_tester/testenv.py b/src/osmo_gsm_tester/testenv.py</span><br><span>index ceea028..8c4743a 100644</span><br><span>--- a/src/osmo_gsm_tester/testenv.py</span><br><span>+++ b/src/osmo_gsm_tester/testenv.py</span><br><span>@@ -36,8 +36,14 @@</span><br><span> Sms = None</span><br><span> process = None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def setup(suite_run, _test, suite_module, event_module, sms_module, process_module):</span><br><span style="color: hsl(120, 100%, 40%);">+def setup(suite_run, _test):</span><br><span style="color: hsl(120, 100%, 40%);">+ from .core import process as process_module</span><br><span style="color: hsl(120, 100%, 40%);">+ from .core.event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+ from .obj.sms import Sms as Sms_class</span><br><span style="color: hsl(120, 100%, 40%);">+ from . import suite as suite_module</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> global trial, suite, test, resources, log, dbg, err, wait, wait_no_raise, sleep, poll, prompt, Timeout, Sms, process</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> trial = suite_run.trial</span><br><span> suite = suite_run</span><br><span> test = _test</span><br><span>@@ -45,13 +51,13 @@</span><br><span> log = test.log</span><br><span> dbg = test.dbg</span><br><span> err = test.err</span><br><span style="color: hsl(0, 100%, 40%);">- wait = lambda *args, **kwargs: event_module.wait(suite_run, *args, **kwargs)</span><br><span style="color: hsl(0, 100%, 40%);">- wait_no_raise = lambda *args, **kwargs: event_module.wait_no_raise(suite_run, *args, **kwargs)</span><br><span style="color: hsl(0, 100%, 40%);">- sleep = lambda *args, **kwargs: event_module.sleep(suite_run, *args, **kwargs)</span><br><span style="color: hsl(0, 100%, 40%);">- poll = event_module.poll</span><br><span style="color: hsl(120, 100%, 40%);">+ wait = lambda *args, **kwargs: MainLoop.wait(suite_run, *args, **kwargs)</span><br><span style="color: hsl(120, 100%, 40%);">+ wait_no_raise = lambda *args, **kwargs: MainLoop.wait_no_raise(suite_run, *args, **kwargs)</span><br><span style="color: hsl(120, 100%, 40%);">+ sleep = lambda *args, **kwargs: MainLoop.sleep(suite_run, *args, **kwargs)</span><br><span style="color: hsl(120, 100%, 40%);">+ poll = MainLoop.poll</span><br><span> prompt = suite_run.prompt</span><br><span> Timeout = suite_module.Timeout</span><br><span style="color: hsl(0, 100%, 40%);">- Sms = sms_module.Sms</span><br><span style="color: hsl(120, 100%, 40%);">+ Sms = Sms_class</span><br><span> process = process_module</span><br><span> </span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span>diff --git a/src/osmo_gsm_tester/trial.py b/src/osmo_gsm_tester/trial.py</span><br><span>index 9dcc188..fb94a59 100644</span><br><span>--- a/src/osmo_gsm_tester/trial.py</span><br><span>+++ b/src/osmo_gsm_tester/trial.py</span><br><span>@@ -22,8 +22,8 @@</span><br><span> import shutil</span><br><span> import tarfile</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 suite, report</span><br><span style="color: hsl(120, 100%, 40%);">+from .core import log, util, report</span><br><span style="color: hsl(120, 100%, 40%);">+from . import suite</span><br><span> </span><br><span> FILE_MARK_TAKEN = 'taken'</span><br><span> FILE_CHECKSUMS = 'checksums.md5'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18033">change 18033</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/+/18033"/><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: Ibb7fa5ab40bcf1e59705bdd2c2c5a76025b2b544 </div>
<div style="display:none"> Gerrit-Change-Number: 18033 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>