From e2a1b1008fe79ca4af70e009dee3897bff7ea7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rud=C3=A1=20Moura?= <rmoura@redhat.com>
Date: Wed, 22 Apr 2015 16:21:49 -0300
Subject: [PATCH] Isolate avocado.sysinfo from being used by test developers.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move avocado.sysinfo to avocado.core.sysinfo, in conformance to our
purpose of keeping things not related to test developers, inside
avocado.core, isolated from users.

Signed-off-by: Rudá Moura <rmoura@redhat.com>
---
 avocado/core/job.py                            | 4 +++-
 avocado/{ => core}/sysinfo.py                  | 0
 avocado/plugins/sysinfo.py                     | 2 +-
 avocado/test.py                                | 3 ++-
 selftests/all/unit/avocado/sysinfo_unittest.py | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)
 rename avocado/{ => core}/sysinfo.py (100%)

diff --git a/avocado/core/job.py b/avocado/core/job.py
index fc281ab8..35b1a56d 100644
--- a/avocado/core/job.py
+++ b/avocado/core/job.py
@@ -29,7 +29,9 @@ import fnmatch
 from avocado import multiplexer
 from avocado import result
 from avocado import runtime
-from avocado import sysinfo
+from avocado.core import runner
+from avocado.core import loader
+from avocado.core import sysinfo
 from avocado.core import runner
 from avocado.core import loader
 from avocado.core import data_dir
diff --git a/avocado/sysinfo.py b/avocado/core/sysinfo.py
similarity index 100%
rename from avocado/sysinfo.py
rename to avocado/core/sysinfo.py
diff --git a/avocado/plugins/sysinfo.py b/avocado/plugins/sysinfo.py
index 1e9c1e02..ca8c7d82 100644
--- a/avocado/plugins/sysinfo.py
+++ b/avocado/plugins/sysinfo.py
@@ -16,7 +16,7 @@ System information plugin
 """
 
 from avocado.plugins import plugin
-from avocado import sysinfo
+from avocado.core import sysinfo
 
 
 class SystemInformation(plugin.Plugin):
diff --git a/avocado/test.py b/avocado/test.py
index ccf9eeff..7e977974 100644
--- a/avocado/test.py
+++ b/avocado/test.py
@@ -31,7 +31,8 @@ if sys.version_info[:2] == (2, 6):
 else:
     import unittest
 
-from avocado import sysinfo, multiplexer
+from avocado import multiplexer
+from avocado.core import sysinfo
 from avocado.core import data_dir
 from avocado.core import exceptions
 from avocado.utils import genio
diff --git a/selftests/all/unit/avocado/sysinfo_unittest.py b/selftests/all/unit/avocado/sysinfo_unittest.py
index ab5e82b7..0d09f2c9 100644
--- a/selftests/all/unit/avocado/sysinfo_unittest.py
+++ b/selftests/all/unit/avocado/sysinfo_unittest.py
@@ -14,7 +14,7 @@ basedir = os.path.dirname(basedir)
 if os.path.isdir(os.path.join(basedir, 'avocado')):
     sys.path.append(basedir)
 
-from avocado import sysinfo
+from avocado.core import sysinfo
 
 
 class SysinfoTest(unittest.TestCase):
-- 
GitLab