chore: update deps

Author: dtopuzov

core/utils/file_utils.py

@@ -7,6 +7,7 @@
 import stat
 
 from core.log.log import Log
+from core.settings import Settings
 
 
 class Folder(object):
@@ -91,7 +92,10 @@ def read(path, log_content=False):
             if log_content:
                 Log.info('Read ' + path + ':')
                 Log.info(output)
-            return output
+            if Settings.PYTHON_VERSION < 3:
+                return str(output.decode('utf8').encode('utf8')).strip()
+            else:
+                return output.decode("utf-8").strip()
         else:
             raise IOError("{0} not found!".format(path))
 

core_tests/utils/file_tests.py

@@ -1,13 +1,12 @@
 import os
 import unittest
 
-from settings import Settings
-from utils.file_utils import File
+from core.settings import Settings
+from core.utils.file_utils import File
 
 
 # noinspection PyMethodMayBeStatic
 class FileUtilsTests(unittest.TestCase):
-
     def test_01_replace(self):
         # Path to files
         base_path = os.path.join(Settings.TEST_RUN_HOME, 'core_tests', 'utils')
@@ -18,19 +17,19 @@ def test_01_replace(self):
 
         # Create new file (so we don't break original one).
         File.copy(src=old_scss, target=new_scss)
-        assert len(File.read(path=new_scss).split('\n')) == 14, 'Unexpected lines count.'
+        assert len(File.read(path=new_scss).splitlines()) == 14, 'Unexpected lines count.'
 
         # Replace
         File.replace(path=new_scss, old_string=old_value, new_string=new_value)
         content = File.read(path=new_scss)
         assert 'red;' in content, 'Failed to replace string.'
-        assert len(content.split('\n')) == 15, 'Unexpected lines count.'
+        assert len(content.splitlines()) == 15, 'Unexpected lines count.'
 
         # Revert
         File.replace(path=new_scss, old_string=new_value, new_string=old_value)
         content = File.read(path=new_scss)
         assert 'red;' not in content, 'Failed to replace string.'
-        assert len(content.split('\n')) == 14, 'Unexpected lines count.'
+        assert len(content.splitlines()) == 14, 'Unexpected lines count.'
 
         File.clean(path=new_scss)
 

requirements.txt

@@ -2,6 +2,7 @@ aenum>=2.1.2
 flaky>=3.4.0
 psutil>=5.4.8
 parameterized>=0.6.1
+nose-parameterized>=0.6.0
 nose>=1.3.7
 nose-html-reporting>=0.2.3
 Pillow>=5.3.0

requirements_darwin.txt

@@ -2,6 +2,7 @@ aenum>=2.1.2
 flaky>=3.4.0
 psutil>=5.4.8
 parameterized>=0.6.1
+nose-parameterized>=0.6.0
 nose>=1.3.7
 nose-html-reporting>=0.2.3
 Pillow>=5.3.0

tests/live/template_tests.py

@@ -1,18 +1,18 @@
 import os
 
-from nose_parameterized import parameterized
+from parameterized import parameterized
 
-from const import Colors
 from core.base_test.tns_test import TnsTest
 from core.enums.env import EnvironmentType
 from core.enums.os_type import OSType
 from core.settings import Settings
+from core.utils.device.adb import Adb
 from core.utils.device.device_manager import DeviceManager
 from core.utils.file_utils import Folder
+from data.const import Colors
 from data.templates import Template
 from products.nativescript.app import App
 from products.nativescript.tns import Tns
-from utils.device.adb import Adb
 
 
 # noinspection PyUnusedLocal