Create a main 'cros' python package
Have a helpers and runners packages is too generic, so create a 'cros'
package to avoid future conflicts and to make clear the scope of the
modules inside the 'cros' package.
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
diff --git a/tests/__init__.py b/cros/__init__.py
similarity index 100%
copy from tests/__init__.py
copy to cros/__init__.py
diff --git a/helpers/__init__.py b/cros/helpers/__init__.py
similarity index 100%
rename from helpers/__init__.py
rename to cros/helpers/__init__.py
diff --git a/helpers/kernel.py b/cros/helpers/kernel.py
similarity index 100%
rename from helpers/kernel.py
rename to cros/helpers/kernel.py
diff --git a/helpers/mcu.py b/cros/helpers/mcu.py
similarity index 98%
rename from helpers/mcu.py
rename to cros/helpers/mcu.py
index 3bfca58..1855788 100644
--- a/helpers/mcu.py
+++ b/cros/helpers/mcu.py
@@ -3,7 +3,7 @@
import fcntl
import os
-from helpers.sysfs import *
+from cros.helpers.sysfs import *
from ctypes import *
EC_CMD_PROTO_VERSION = 0x0000
diff --git a/helpers/sysfs.py b/cros/helpers/sysfs.py
similarity index 100%
rename from helpers/sysfs.py
rename to cros/helpers/sysfs.py
diff --git a/runners/__init__.py b/cros/runners/__init__.py
similarity index 100%
rename from runners/__init__.py
rename to cros/runners/__init__.py
diff --git a/runners/lava_runner.py b/cros/runners/lava_runner.py
similarity index 86%
rename from runners/lava_runner.py
rename to cros/runners/lava_runner.py
index b94ce8c..75a723d 100755
--- a/runners/lava_runner.py
+++ b/cros/runners/lava_runner.py
@@ -4,13 +4,13 @@
import sys
import unittest
-from tests.cros_ec_accel import *
-from tests.cros_ec_gyro import *
-from tests.cros_ec_mcu import *
-from tests.cros_ec_pwm import *
-from tests.cros_ec_rtc import *
-from tests.cros_ec_power import *
-from tests.cros_ec_extcon import *
+from cros.tests.cros_ec_accel import *
+from cros.tests.cros_ec_gyro import *
+from cros.tests.cros_ec_mcu import *
+from cros.tests.cros_ec_pwm import *
+from cros.tests.cros_ec_rtc import *
+from cros.tests.cros_ec_power import *
+from cros.tests.cros_ec_extcon import *
class LavaTextTestResult(unittest.TestResult):
diff --git a/tests/__init__.py b/cros/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to cros/tests/__init__.py
diff --git a/tests/cros_ec_accel.py b/cros/tests/cros_ec_accel.py
similarity index 96%
rename from tests/cros_ec_accel.py
rename to cros/tests/cros_ec_accel.py
index 6d20d79..6884ab5 100644
--- a/tests/cros_ec_accel.py
+++ b/cros/tests/cros_ec_accel.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-from helpers.sysfs import *
-from helpers.kernel import *
+from cros.helpers.sysfs import *
+from cros.helpers.kernel import *
import math
import unittest
diff --git a/tests/cros_ec_extcon.py b/cros/tests/cros_ec_extcon.py
similarity index 97%
rename from tests/cros_ec_extcon.py
rename to cros/tests/cros_ec_extcon.py
index f68c4c9..b72a1ec 100644
--- a/tests/cros_ec_extcon.py
+++ b/cros/tests/cros_ec_extcon.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-from helpers.sysfs import *
+from cros.helpers.sysfs import *
import unittest
diff --git a/tests/cros_ec_gyro.py b/cros/tests/cros_ec_gyro.py
similarity index 93%
rename from tests/cros_ec_gyro.py
rename to cros/tests/cros_ec_gyro.py
index 8d11b18..0f48d2e 100644
--- a/tests/cros_ec_gyro.py
+++ b/cros/tests/cros_ec_gyro.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-from helpers.sysfs import *
-from helpers.kernel import *
+from cros.helpers.sysfs import *
+from cros.helpers.kernel import *
import unittest
diff --git a/tests/cros_ec_mcu.py b/cros/tests/cros_ec_mcu.py
similarity index 97%
rename from tests/cros_ec_mcu.py
rename to cros/tests/cros_ec_mcu.py
index 1b5bb51..f108d44 100644
--- a/tests/cros_ec_mcu.py
+++ b/cros/tests/cros_ec_mcu.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-from helpers.mcu import *
+from cros.helpers.mcu import *
import fcntl
import unittest
diff --git a/tests/cros_ec_power.py b/cros/tests/cros_ec_power.py
similarity index 97%
rename from tests/cros_ec_power.py
rename to cros/tests/cros_ec_power.py
index 0515d4b..6cc0e8c 100644
--- a/tests/cros_ec_power.py
+++ b/cros/tests/cros_ec_power.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-from helpers.sysfs import *
+from cros.helpers.sysfs import *
import unittest
diff --git a/tests/cros_ec_pwm.py b/cros/tests/cros_ec_pwm.py
similarity index 97%
rename from tests/cros_ec_pwm.py
rename to cros/tests/cros_ec_pwm.py
index db084a6..2950ee2 100644
--- a/tests/cros_ec_pwm.py
+++ b/cros/tests/cros_ec_pwm.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-from helpers.sysfs import *
+from cros.helpers.sysfs import *
import unittest
diff --git a/tests/cros_ec_rtc.py b/cros/tests/cros_ec_rtc.py
similarity index 93%
rename from tests/cros_ec_rtc.py
rename to cros/tests/cros_ec_rtc.py
index 3aa05c1..60ca265 100644
--- a/tests/cros_ec_rtc.py
+++ b/cros/tests/cros_ec_rtc.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-from helpers.mcu import *
-from helpers.sysfs import *
+from cros.helpers.mcu import *
+from cros.helpers.sysfs import *
import unittest
diff --git a/crostests.yaml b/crostests.yaml
index 67774bf..74a70b2 100644
--- a/crostests.yaml
+++ b/crostests.yaml
@@ -6,4 +6,4 @@
run:
steps:
- - python3 -m runners.lava_runner
+ - python3 -m cros.runners.lava_runner
diff --git a/docs/source/testcases.rst b/docs/source/testcases.rst
index 8711594..c69c91b 100644
--- a/docs/source/testcases.rst
+++ b/docs/source/testcases.rst
@@ -12,42 +12,42 @@
cros-ec-accel
=============
-.. automodule:: tests.cros_ec_accel
+.. automodule:: cros.tests.cros_ec_accel
:members:
cros-ec-extcon
==============
-.. automodule:: tests.cros_ec_extcon
+.. automodule:: cros.tests.cros_ec_extcon
:members:
cros-ec-gyro
============
-.. automodule:: tests.cros_ec_gyro
+.. automodule:: cros.tests.cros_ec_gyro
:members:
cros-ec-mcu
===========
-.. automodule:: tests.cros_ec_mcu
+.. automodule:: cros.tests.cros_ec_mcu
:members:
cros-ec-power
=============
-.. automodule:: tests.cros_ec_power
+.. automodule:: cros.tests.cros_ec_power
:members:
cros-ec-pwm
===========
-.. automodule:: tests.cros_ec_pwm
+.. automodule:: cros.tests.cros_ec_pwm
:members:
cros-ec-rtc
===========
-.. automodule:: tests.cros_ec_rtc
+.. automodule:: cros.tests.cros_ec_rtc
:members:
diff --git a/docs/source/testhelpers.rst b/docs/source/testhelpers.rst
index d26e77b..380b1bd 100644
--- a/docs/source/testhelpers.rst
+++ b/docs/source/testhelpers.rst
@@ -5,18 +5,18 @@
kernel
======
-.. automodule:: helpers.kernel
+.. automodule:: cros.helpers.kernel
:members:
mcu
===
-.. automodule:: helpers.mcu
+.. automodule:: cros.helpers.mcu
:members:
sysfs
=====
-.. automodule:: helpers.sysfs
+.. automodule:: cros.helpers.sysfs
:members:
diff --git a/docs/source/testrunners.rst b/docs/source/testrunners.rst
index 63330db..753dea3 100644
--- a/docs/source/testrunners.rst
+++ b/docs/source/testrunners.rst
@@ -13,6 +13,6 @@
LAVA Test Runner
----------------
-.. automodule:: runners.lava_runner
+.. automodule:: cros.runners.lava_runner
:members:
