From a9b1a4207d6cb1a6b7421e3905cc7b3027866c87 Mon Sep 17 00:00:00 2001 From: xuhy Date: Thu, 6 Jun 2024 15:57:14 +0800 Subject: [PATCH] Fix build errors on ubuntu 24.04. Change-Id: I0fee400c5f71b11e60fe898f0144421e7169ad94 Signed-off-by: xuhy --- debian/control | 7 ++++++- debian/itest-core.install | 14 +++++++------- debian/nosexcase.install | 2 +- debian/rules | 4 +++- debian/spm.install | 6 +++--- itest/case.py | 8 ++++---- itest/conf/__init__.py | 5 +++-- setup.py | 2 +- 8 files changed, 28 insertions(+), 20 deletions(-) diff --git a/debian/control b/debian/control index b822e97..7cee1b6 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,12 @@ Homepage: http://www.tizen.org Package: itest-core Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, - python3-pexpect, python3-coverage, python3-jinja2, python3-unittest2, spm + python3-distro, + python3-pexpect, + python3-coverage, + python3-jinja2, + python3-unittest2, + spm Description: functional test framework for gbs and mic Package: spm diff --git a/debian/itest-core.install b/debian/itest-core.install index 0ff6eb9..cd99968 100644 --- a/debian/itest-core.install +++ b/debian/itest-core.install @@ -1,7 +1,7 @@ -usr/lib/python*/*packages/itest/*.py -usr/lib/python*/*packages/itest/conf/*.py -usr/lib/python*/*packages/imgdiff/*.py -usr/lib/python*/*packages/itest-*.egg-info -usr/bin/runtest -usr/bin/runtest_pty -usr/bin/imgdiff +usr/local/lib/python*/*packages/itest/*.py +usr/local/lib/python*/*packages/itest/conf/*.py +usr/local/lib/python*/*packages/imgdiff/*.py +usr/local/lib/python*/*packages/itest-*.egg-info +usr/local/bin/runtest /usr/bin +usr/local/bin/runtest_pty /usr/bin +usr/local/bin/imgdiff /usr/bin diff --git a/debian/nosexcase.install b/debian/nosexcase.install index a84efef..99d5c48 100644 --- a/debian/nosexcase.install +++ b/debian/nosexcase.install @@ -1 +1 @@ -usr/lib/python*/*packages/nosexcase/*.py +usr/local/lib/python*/*packages/nosexcase/*.py diff --git a/debian/rules b/debian/rules index 7aa69e7..7c6f2d0 100644 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,9 @@ dh $@ --with python3 --buildsystem=pybuild override_dh_auto_install: - python3 setup.py install --root=debian/tmp --prefix=/usr + python3 setup.py install --root=debian/tmp --prefix=/usr/local override_dh_auto_test: @echo 'Skipping autotests' + +override_dh_usrlocal: diff --git a/debian/spm.install b/debian/spm.install index 4f48cb4..1ca88fe 100644 --- a/debian/spm.install +++ b/debian/spm.install @@ -1,4 +1,4 @@ -usr/lib/python*/*packages/spm/*.py -usr/lib/python*/*packages/spm/templates/*.html -usr/bin/spm +usr/local/lib/python*/*packages/spm/*.py +usr/local/lib/python*/*packages/spm/templates/*.html +usr/local/bin/spm /usr/bin etc/spm.yml diff --git a/itest/case.py b/itest/case.py index 3094791..f88d059 100644 --- a/itest/case.py +++ b/itest/case.py @@ -93,11 +93,11 @@ def pcall(cmd, args=(), expecting=(), output=None, # itestuser23794's password: # u1110-32b # [sudo] password for itester: -SUDO_PASS_PROMPT_PATTERN = "\[sudo\] password for .*?:|" \ +SUDO_PASS_PROMPT_PATTERN = r"\[sudo\] password for .*?:|" \ "root's password:|" \ ".*?'s password:" -SUDO_PASS_PROMPT_PATTERN_FEDORA_20_i586 = "\[sudo\] password for .*?:|" \ +SUDO_PASS_PROMPT_PATTERN_FEDORA_20_i586 = r"\[sudo\] password for .*?:|" \ "root's password:" class Tee(object): @@ -172,8 +172,8 @@ class Meta(object): # FIXME: it's a little hack here # delete color code - os.system("sed -i 's/\x1b\[[0-9]*m//g' %s" % self.logname) - os.system("sed -i 's/\x1b\[[0-9]*K//g' %s" % self.logname) + os.system(r"sed -i 's/\x1b\[[0-9]*m//g' %s" % self.logname) + os.system(r"sed -i 's/\x1b\[[0-9]*K//g' %s" % self.logname) def setup(self): code = 0 diff --git a/itest/conf/__init__.py b/itest/conf/__init__.py index abdc46b..d780bf7 100644 --- a/itest/conf/__init__.py +++ b/itest/conf/__init__.py @@ -2,8 +2,9 @@ These LazyObject, LazySettings and Settings are mainly copied from Django ''' +from importlib.machinery import SourceFileLoader + import os -import imp import time @@ -42,7 +43,7 @@ def load_settings(test_project_root=None): if test_project_root: settings_py = os.path.join(test_project_root, 'settings.py') try: - mod = imp.load_source('settings', settings_py) + mod = SourceFileLoader('settings', settings_py).load_module() except (ImportError, IOError) as e: raise ImportError("Could not import settings '%s' (Is it on " "sys.path?): %s" % (settings_py, e)) diff --git a/setup.py b/setup.py index 53ad0d5..1428662 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setup(name='itest', license='GPLv2', platforms=['Linux'], include_package_data=True, - packages=['itest', 'itest.conf', 'imgdiff', 'spm', 'nosexcase'], + packages=['itest', 'itest.conf', 'imgdiff', 'spm', 'spm.templates', 'nosexcase'], package_data={'': ['*.html']}, data_files=[('/etc', ['spm/spm.yml'])], entry_points={ -- 2.34.1