Move trial.py and suite.py to core/

Change-Id: Ic9a4c90c190e9d8e1829fbef83a9243f3c6f655b

selftest/suite_test.py

@@ -3,8 +3,8 @@ import os
 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'
 

selftest/trial_test.py

@@ -4,7 +4,7 @@ import time
 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()
 

src/osmo-gsm-tester.py

@@ -71,9 +71,10 @@ import argparse
 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)

src/osmo_gsm_tester/core/suite.py

@@ -21,12 +21,12 @@ import os
 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.

src/osmo_gsm_tester/core/trial.py

@@ -22,10 +22,9 @@ import time
 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'