Skip to content

Commit b0cb59b

Browse files
committed
Merge branch 'Fix' into develop
2 parents 8b8a786 + a222992 commit b0cb59b

7 files changed

+6
-6
lines changed

tests/check_jeedom_compatibility_from_src.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import re
66
import sys
77
import os
8-
from tests.libs.tests_funcs import *
8+
from pylibs.tests_funcs import *
99

1010
AJAX_PATH = '/tmp/jeedom-core/core/ajax/'
1111
CLASS_PATH = '/tmp/jeedom-core/core/class/'

tests/launch_code_consistency.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"""
66
import sys
77
import os
8-
from tests.libs.tests_funcs import *
8+
from pylibs.tests_funcs import *
99

1010
def check_php():
1111
"""Check php code consistency
@@ -29,7 +29,7 @@ def check_python():
2929
"""Check python code quality
3030
"""
3131
print_subtitle('Python code quality')
32-
folders_to_test = ['', 'tests/libs/']
32+
folders_to_test = ['', 'pylibs/']
3333
error = False
3434
for folder_to_test in folders_to_test:
3535
output, status = get_command_output('python3 -m pylint --rcfile=.pylintrc --output-format=colorized ' + folder_to_test + '*.py') #pylint: disable=line-too-long

tests/launch_compatibility_tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"""Launch NextDom GUI tests
55
"""
66
import sys
7-
from tests.libs.tests_funcs import *
7+
from pylibs.tests_funcs import *
88

99
NEXTDOM_URL = 'http://127.0.0.1:8765'
1010
NEXTDOM_LOGIN = 'admin'

tests/launch_php_tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"""Launch NextDom GUI tests
55
"""
66
import sys
7-
from tests.libs.tests_funcs import *
7+
from pylibs.tests_funcs import *
88

99
NEXTDOM_URL = 'http://127.0.0.1:8765'
1010
NEXTDOM_LOGIN = 'admin'
File renamed without changes.
File renamed without changes.

tests/start_docker_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Launch NextDom GUI tests
22
"""
3-
from tests.libs.tests_funcs import *
3+
from pylibs.tests_funcs import *
44

55
NEXTDOM_URL = 'http://127.0.0.1:8765'
66
NEXTDOM_LOGIN = 'admin'

0 commit comments

Comments
 (0)