Change in osmo-gsm-tester[master]: Move trial.py and suite.py to core/

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.org
Tue May 5 14:45:41 UTC 2020


pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18044 )

Change subject: Move trial.py and suite.py to core/
......................................................................

Move trial.py and suite.py to core/

Change-Id: Ic9a4c90c190e9d8e1829fbef83a9243f3c6f655b
---
M selftest/suite_test.py
M selftest/trial_test.py
M src/osmo-gsm-tester.py
R src/osmo_gsm_tester/core/suite.py
R src/osmo_gsm_tester/core/trial.py
5 files changed, 13 insertions(+), 13 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



diff --git a/selftest/suite_test.py b/selftest/suite_test.py
index 560ca50..de5c6df 100755
--- a/selftest/suite_test.py
+++ b/selftest/suite_test.py
@@ -3,8 +3,8 @@
 import _prep
 import shutil
 from osmo_gsm_tester.core import log, config, util, report
+from osmo_gsm_tester.core import suite
 from osmo_gsm_tester.core.schema import generate_schemas
-from osmo_gsm_tester import suite
 
 config.ENV_CONF = './suite_test'
 
diff --git a/selftest/trial_test.py b/selftest/trial_test.py
index e73ca37..41d71e6 100755
--- a/selftest/trial_test.py
+++ b/selftest/trial_test.py
@@ -4,7 +4,7 @@
 import _prep
 import os
 from osmo_gsm_tester.core import util
-from osmo_gsm_tester.trial import Trial
+from osmo_gsm_tester.core.trial import Trial
 
 workdir = util.get_tempdir()
 
diff --git a/src/osmo-gsm-tester.py b/src/osmo-gsm-tester.py
index af66b32..dc1e058 100755
--- a/src/osmo-gsm-tester.py
+++ b/src/osmo-gsm-tester.py
@@ -71,9 +71,10 @@
 from signal import *
 from osmo_gsm_tester import __version__
 from osmo_gsm_tester.core import log
+from osmo_gsm_tester.core import trial
+from osmo_gsm_tester.core import suite
 from osmo_gsm_tester.core.config import read_config_file, DEFAULT_SUITES_CONF
 from osmo_gsm_tester.core.schema import generate_schemas
-from osmo_gsm_tester import trial, suite
 
 def sig_handler_cleanup(signum, frame):
     print("killed by signal %d" % signum)
diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/core/suite.py
similarity index 98%
rename from src/osmo_gsm_tester/suite.py
rename to src/osmo_gsm_tester/core/suite.py
index 3416ff5..0995f8f 100644
--- a/src/osmo_gsm_tester/suite.py
+++ b/src/osmo_gsm_tester/core/suite.py
@@ -21,12 +21,12 @@
 import sys
 import time
 import pprint
-from .core import config
-from .core import log
-from .core import util
-from .core import schema
-from .core import resource
-from .core import test
+from . import config
+from . import log
+from . import util
+from . import schema
+from . import resource
+from . import test
 
 class SuiteDefinition(log.Origin):
     '''A test suite reserves resources for a number of tests.
diff --git a/src/osmo_gsm_tester/trial.py b/src/osmo_gsm_tester/core/trial.py
similarity index 98%
rename from src/osmo_gsm_tester/trial.py
rename to src/osmo_gsm_tester/core/trial.py
index 08b7d8f..83b0f11 100644
--- a/src/osmo_gsm_tester/trial.py
+++ b/src/osmo_gsm_tester/core/trial.py
@@ -22,10 +22,9 @@
 import shutil
 import tarfile
 
-from .core import log
-from .core import util
-from .core import report
-
+from . import log
+from . import util
+from . import report
 from . import suite
 
 FILE_MARK_TAKEN = 'taken'

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18044
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: Ic9a4c90c190e9d8e1829fbef83a9243f3c6f655b
Gerrit-Change-Number: 18044
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200505/e50cd567/attachment.htm>


More information about the gerrit-log mailing list