Message ID | 20230330171226.3693157-1-ross.burton@arm.com |
---|---|
State | Accepted, archived |
Commit | 77085a05240c3f8226b9f2199c977f2555807789 |
Headers | show |
Series | oeqa/runtime: clean up deprecated backslash expansion | expand |
On Thu, 2023-03-30 at 18:12 +0100, Ross Burton wrote: > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta/lib/oeqa/runtime/cases/apt.py | 4 ++-- > meta/lib/oeqa/runtime/cases/buildcpio.py | 7 +++++-- > meta/lib/oeqa/runtime/cases/systemd.py | 2 +- > 3 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/meta/lib/oeqa/runtime/cases/apt.py b/meta/lib/oeqa/runtime/cases/apt.py > index 4e09374adde..8000645843a 100644 > --- a/meta/lib/oeqa/runtime/cases/apt.py > +++ b/meta/lib/oeqa/runtime/cases/apt.py > @@ -39,9 +39,9 @@ class AptRepoTest(AptTest): > self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s/all ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server)) > > def setup_source_config_for_package_install_signed(self): > - apt_get_source_server = 'http:\/\/%s:%s' % (self.tc.target.server_ip, self.repo_server.port) > + apt_get_source_server = 'http://%s:%s' % (self.tc.target.server_ip, self.repo_server.port) > apt_get_sourceslist_dir = '/etc/apt/' > - self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's/\[trusted=yes\] http:\/\/bogus_ip:bogus_port/%s/g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server)) > + self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's|\[trusted=yes\] http://bogus_ip:bogus_port|%s|g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server)) > > def cleanup_source_config_for_package_install(self): > apt_get_sourceslist_dir = '/etc/apt/' > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py > index bd3b46d9ef0..c08de3c914d 100644 > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py > @@ -29,7 +29,10 @@ class BuildCpioTest(OERuntimeTestCase): > @OEHasPackage(['autoconf']) > def test_cpio(self): > self.project.download_archive() > - self.project.run_configure('--disable-maintainer-mode', > - 'sed -i -e "/char \*program_name/d" src/global.c;') > + self.project.run_configure('--disable-maintainer-mode') > + # This sed is needed until > + # https://git.savannah.gnu.org/cgit/cpio.git/commit/src/global.c?id=641d3f489cf6238bb916368d4ba0d9325a235afb > + # is in a release. > + self.project._run(r'sed -i -e "/char \*program_name/d" src/global.c') > self.project.run_make() > self.project.run_install() > diff --git a/meta/lib/oeqa/runtime/cases/systemd.py b/meta/lib/oeqa/runtime/cases/systemd.py > index 720b4b517ae..37f295492d3 100644 > --- a/meta/lib/oeqa/runtime/cases/systemd.py > +++ b/meta/lib/oeqa/runtime/cases/systemd.py > @@ -154,7 +154,7 @@ class SystemdJournalTests(SystemdTest): > """ > > # The expression chain that uniquely identifies the time boot message. > - expr_items=['Startup finished', 'kernel', 'userspace','\.$'] > + expr_items=['Startup finished', 'kernel', 'userspace', r'\.$'] > try: > output = self.journalctl(args='-o cat --reverse') > except AssertionError: https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/6944/steps/12/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/6898/steps/12/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/6918/steps/12/logs/stdio and quite a few more :( Cheers, Richard
diff --git a/meta/lib/oeqa/runtime/cases/apt.py b/meta/lib/oeqa/runtime/cases/apt.py index 4e09374adde..8000645843a 100644 --- a/meta/lib/oeqa/runtime/cases/apt.py +++ b/meta/lib/oeqa/runtime/cases/apt.py @@ -39,9 +39,9 @@ class AptRepoTest(AptTest): self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s/all ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server)) def setup_source_config_for_package_install_signed(self): - apt_get_source_server = 'http:\/\/%s:%s' % (self.tc.target.server_ip, self.repo_server.port) + apt_get_source_server = 'http://%s:%s' % (self.tc.target.server_ip, self.repo_server.port) apt_get_sourceslist_dir = '/etc/apt/' - self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's/\[trusted=yes\] http:\/\/bogus_ip:bogus_port/%s/g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server)) + self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's|\[trusted=yes\] http://bogus_ip:bogus_port|%s|g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server)) def cleanup_source_config_for_package_install(self): apt_get_sourceslist_dir = '/etc/apt/' diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index bd3b46d9ef0..c08de3c914d 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -29,7 +29,10 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure('--disable-maintainer-mode', - 'sed -i -e "/char \*program_name/d" src/global.c;') + self.project.run_configure('--disable-maintainer-mode') + # This sed is needed until + # https://git.savannah.gnu.org/cgit/cpio.git/commit/src/global.c?id=641d3f489cf6238bb916368d4ba0d9325a235afb + # is in a release. + self.project._run(r'sed -i -e "/char \*program_name/d" src/global.c') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/runtime/cases/systemd.py b/meta/lib/oeqa/runtime/cases/systemd.py index 720b4b517ae..37f295492d3 100644 --- a/meta/lib/oeqa/runtime/cases/systemd.py +++ b/meta/lib/oeqa/runtime/cases/systemd.py @@ -154,7 +154,7 @@ class SystemdJournalTests(SystemdTest): """ # The expression chain that uniquely identifies the time boot message. - expr_items=['Startup finished', 'kernel', 'userspace','\.$'] + expr_items=['Startup finished', 'kernel', 'userspace', r'\.$'] try: output = self.journalctl(args='-o cat --reverse') except AssertionError:
Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/lib/oeqa/runtime/cases/apt.py | 4 ++-- meta/lib/oeqa/runtime/cases/buildcpio.py | 7 +++++-- meta/lib/oeqa/runtime/cases/systemd.py | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-)