Fix import path

risuorg · Aug 22, 2024 · a57e732 · a57e732
1 parent 4d4a7c9
commit a57e732
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 26 deletions.
diff --git a/tests/cf-uts/test_cf_is_active.py b/tests/cf-uts/test_cf_is_active.py
@@ -13,20 +13,21 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 from unittest import TestCase
 
-import risuclient.shell as risu
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../"))
+sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../" + "../"))
 
+try:
+    import risuclient.shell as risu
+except:
+    import shell as risu
 
 # To create your own test, update NAME with plugin name and copy this file to test_$NAME.py
 NAME = "test_cf_is_active"

diff --git a/tests/cf-uts/test_cf_is_lineinfile.py b/tests/cf-uts/test_cf_is_lineinfile.py
@@ -23,10 +23,12 @@
 import tempfile
 from unittest import TestCase
 
-import risuclient.shell as risu
-
-sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../"))
+sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../" + "../"))
 
+try:
+    import risuclient.shell as risu
+except:
+    import shell as risu
 
 # To create your own test, update NAME with plugin name and copy this file to test_$NAME.py
 NAME = "test_cf_is_lineinfile"

diff --git a/tests/cf-uts/test_cf_is_process.py b/tests/cf-uts/test_cf_is_process.py
@@ -13,20 +13,21 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 from unittest import TestCase
 
-import risuclient.shell as risu
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../"))
+sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../" + "../"))
 
+try:
+    import risuclient.shell as risu
+except:
+    import shell as risu
 
 # To create your own test, update NAME with plugin name and copy this file to test_$NAME.py
 NAME = "test_cf_is_process"

diff --git a/tests/cf-uts/test_cf_is_required_file.py b/tests/cf-uts/test_cf_is_required_file.py
@@ -23,10 +23,12 @@
 import tempfile
 from unittest import TestCase
 
-import risuclient.shell as risu
-
-sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../"))
+sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../" + "../"))
 
+try:
+    import risuclient.shell as risu
+except:
+    import shell as risu
 
 # To create your own test, update NAME with plugin name and copy this file to test_$NAME.py
 NAME = "test_cf_is_required_file"

diff --git a/tests/cf-uts/test_cf_is_required_rpm.py b/tests/cf-uts/test_cf_is_required_rpm.py
@@ -13,20 +13,21 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 from unittest import TestCase
 
-import risuclient.shell as risu
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../"))
+sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../" + "../"))
 
+try:
+    import risuclient.shell as risu
+except:
+    import shell as risu
 
 # To create your own test, update NAME with plugin name and copy this file to test_$NAME.py
 NAME = "test_cf_is_required_rpm"

diff --git a/tests/cf-uts/test_cf_is_rpm.py b/tests/cf-uts/test_cf_is_rpm.py
@@ -23,10 +23,13 @@
 import tempfile
 from unittest import TestCase
 
-import risuclient.shell as risu
+sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../" + "../"))
 
-sys.path.append(os.path.abspath(os.path.dirname(__file__) + "/" + "../"))
 
+try:
+    import risuclient.shell as risu
+except:
+    import shell as risu
 
 # To create your own test, update NAME with plugin name and copy this file to test_$NAME.py
 NAME = "test_cf_is_rpm"