Merge pull request #73 from cloudmesh/windows

fix imports
cloudmesh · May 28, 2022 · 2d89758 · 2d89758
2 parents 7abc43c + 21df49a
commit 2d89758
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/dev-scripts/ddd.py b/dev-scripts/ddd.py
@@ -115,7 +115,7 @@ def encrypt_user_passwd(password):
 timezone = "Asia/Kolkata"
 
 from cloudmesh.burn.raspberryos.runfirst import Runfirst
-from cloudmesh.burn.util import os_is_windows
+from cloudmesh.common.systeminfo import os_is_windows
 
 runfirst = Runfirst()
 

diff --git a/dev-scripts/ddd1.py b/dev-scripts/ddd1.py
@@ -70,7 +70,7 @@ def writefile(filename, content):
 timezone = "Asia/Kolkata"
 
 from cloudmesh.burn.raspberryos.runfirst import Runfirst
-from cloudmesh.burn.util import os_is_windows
+from cloudmesh.common.systeminfo import os_is_windows
 
 runfirst = Runfirst()
 

diff --git a/tests/test_01_image.py b/tests/test_01_image.py
@@ -8,7 +8,7 @@
 import sys
 
 import pytest
-from cloudmesh.burn.util import os_is_windows
+from cloudmesh.common.systeminfo import os_is_windows
 from cloudmesh.common.Benchmark import Benchmark
 from cloudmesh.common.Shell import Shell
 from cloudmesh.common.console import Console

diff --git a/tests/test_02_burn.py b/tests/test_02_burn.py
@@ -9,9 +9,9 @@
 
 import pytest
 from cloudmesh.burn.sdcard import SDCard
-from cloudmesh.burn.util import os_is_mac
-from cloudmesh.burn.util import os_is_linux
-from cloudmesh.burn.util import os_is_pi
+from cloudmesh.common.systeminfo import os_is_mac
+from cloudmesh.common.systeminfo import os_is_linux
+from cloudmesh.common.systeminfo import os_is_pi
 from cloudmesh.common.Benchmark import Benchmark
 from cloudmesh.common.Shell import Shell
 from cloudmesh.common.console import Console

diff --git a/tests/test_03_clone.py b/tests/test_03_clone.py
@@ -9,8 +9,8 @@
 
 import pytest
 from cloudmesh.burn.sdcard import SDCard
-from cloudmesh.burn.util import os_is_linux
-from cloudmesh.burn.util import os_is_pi
+from cloudmesh.common.systeminfo import os_is_linux
+from cloudmesh.common.systeminfo import os_is_pi
 from cloudmesh.common.Benchmark import Benchmark
 from cloudmesh.common.Shell import Shell
 from cloudmesh.common.console import Console