<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18044">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 trial.py and suite.py to core/<br><br>Change-Id: Ic9a4c90c190e9d8e1829fbef83a9243f3c6f655b<br>---<br>M selftest/suite_test.py<br>M selftest/trial_test.py<br>M src/osmo-gsm-tester.py<br>R src/osmo_gsm_tester/core/suite.py<br>R src/osmo_gsm_tester/core/trial.py<br>5 files changed, 13 insertions(+), 13 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 560ca50..de5c6df 100755</span><br><span>--- a/selftest/suite_test.py</span><br><span>+++ b/selftest/suite_test.py</span><br><span>@@ -3,8 +3,8 @@</span><br><span> import _prep</span><br><span> import shutil</span><br><span> from osmo_gsm_tester.core import log, config, util, report</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester.core import suite</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</span><br><span> </span><br><span> config.ENV_CONF = './suite_test'</span><br><span> </span><br><span>diff --git a/selftest/trial_test.py b/selftest/trial_test.py</span><br><span>index e73ca37..41d71e6 100755</span><br><span>--- a/selftest/trial_test.py</span><br><span>+++ b/selftest/trial_test.py</span><br><span>@@ -4,7 +4,7 @@</span><br><span> import _prep</span><br><span> import os</span><br><span> from osmo_gsm_tester.core import util</span><br><span style="color: hsl(0, 100%, 40%);">-from osmo_gsm_tester.trial import Trial</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester.core.trial import Trial</span><br><span> </span><br><span> workdir = util.get_tempdir()</span><br><span> </span><br><span>diff --git a/src/osmo-gsm-tester.py b/src/osmo-gsm-tester.py</span><br><span>index af66b32..dc1e058 100755</span><br><span>--- a/src/osmo-gsm-tester.py</span><br><span>+++ b/src/osmo-gsm-tester.py</span><br><span>@@ -71,9 +71,10 @@</span><br><span> from signal import *</span><br><span> from osmo_gsm_tester import __version__</span><br><span> from osmo_gsm_tester.core import log</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester.core import trial</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester.core import suite</span><br><span> from osmo_gsm_tester.core.config import read_config_file, DEFAULT_SUITES_CONF</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 trial, suite</span><br><span> </span><br><span> def sig_handler_cleanup(signum, frame):</span><br><span>     print("killed by signal %d" % signum)</span><br><span>diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/core/suite.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/suite.py</span><br><span>rename to src/osmo_gsm_tester/core/suite.py</span><br><span>index 3416ff5..0995f8f 100644</span><br><span>--- a/src/osmo_gsm_tester/suite.py</span><br><span>+++ b/src/osmo_gsm_tester/core/suite.py</span><br><span>@@ -21,12 +21,12 @@</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</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 util</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import schema</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import resource</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import test</span><br><span style="color: hsl(120, 100%, 40%);">+from . import config</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log</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 style="color: hsl(120, 100%, 40%);">+from . import resource</span><br><span style="color: hsl(120, 100%, 40%);">+from . import test</span><br><span> </span><br><span> class SuiteDefinition(log.Origin):</span><br><span>     '''A test suite reserves resources for a number of tests.</span><br><span>diff --git a/src/osmo_gsm_tester/trial.py b/src/osmo_gsm_tester/core/trial.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/trial.py</span><br><span>rename to src/osmo_gsm_tester/core/trial.py</span><br><span>index 08b7d8f..83b0f11 100644</span><br><span>--- a/src/osmo_gsm_tester/trial.py</span><br><span>+++ b/src/osmo_gsm_tester/core/trial.py</span><br><span>@@ -22,10 +22,9 @@</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</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 report</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log</span><br><span style="color: hsl(120, 100%, 40%);">+from . import util</span><br><span style="color: hsl(120, 100%, 40%);">+from . import report</span><br><span> from . import suite</span><br><span> </span><br><span> FILE_MARK_TAKEN = 'taken'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18044">change 18044</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/+/18044"/><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: Ic9a4c90c190e9d8e1829fbef83a9243f3c6f655b </div>
<div style="display:none"> Gerrit-Change-Number: 18044 </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>