diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-05 14:17:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-16 08:19:34 +0000 |
commit | e1e38c9bd16220f78068299cd90692d96d045bf9 (patch) | |
tree | 61ea2bf816f730d2d48545facdce89b020e06131 /meta/lib/oeqa/selftest/cases/sstatetests.py | |
parent | 8d2dd4a30034559838e2433ad58aeffccaf40555 (diff) | |
download | poky-e1e38c9bd16220f78068299cd90692d96d045bf9.tar.gz |
lib/oe,oeqa/selftest: Fix DeprecationWarning: invalid escape sequence
Fix another load of regex escape sequence warnings for newer
python versions.
(From OE-Core rev: bd2c125bb9c362b6122e99dfdf4e1cfe12c26a90)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/sstatetests.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/sstatetests.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 077d6e5374..938e654e9a 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py | |||
@@ -96,14 +96,14 @@ class SStateTests(SStateBase): | |||
96 | bitbake(['-ccleansstate'] + targets) | 96 | bitbake(['-ccleansstate'] + targets) |
97 | 97 | ||
98 | bitbake(targets) | 98 | bitbake(targets) |
99 | tgz_created = self.search_sstate('|'.join(map(str, [s + '.*?\.tgz$' for s in targets])), distro_specific, distro_nonspecific) | 99 | tgz_created = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific, distro_nonspecific) |
100 | self.assertTrue(tgz_created, msg="Could not find sstate .tgz files for: %s (%s)" % (', '.join(map(str, targets)), str(tgz_created))) | 100 | self.assertTrue(tgz_created, msg="Could not find sstate .tgz files for: %s (%s)" % (', '.join(map(str, targets)), str(tgz_created))) |
101 | 101 | ||
102 | siginfo_created = self.search_sstate('|'.join(map(str, [s + '.*?\.siginfo$' for s in targets])), distro_specific, distro_nonspecific) | 102 | siginfo_created = self.search_sstate('|'.join(map(str, [s + r'.*?\.siginfo$' for s in targets])), distro_specific, distro_nonspecific) |
103 | self.assertTrue(siginfo_created, msg="Could not find sstate .siginfo files for: %s (%s)" % (', '.join(map(str, targets)), str(siginfo_created))) | 103 | self.assertTrue(siginfo_created, msg="Could not find sstate .siginfo files for: %s (%s)" % (', '.join(map(str, targets)), str(siginfo_created))) |
104 | 104 | ||
105 | bitbake(['-ccleansstate'] + targets) | 105 | bitbake(['-ccleansstate'] + targets) |
106 | tgz_removed = self.search_sstate('|'.join(map(str, [s + '.*?\.tgz$' for s in targets])), distro_specific, distro_nonspecific) | 106 | tgz_removed = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific, distro_nonspecific) |
107 | self.assertTrue(not tgz_removed, msg="do_cleansstate didn't remove .tgz sstate files for: %s (%s)" % (', '.join(map(str, targets)), str(tgz_removed))) | 107 | self.assertTrue(not tgz_removed, msg="do_cleansstate didn't remove .tgz sstate files for: %s (%s)" % (', '.join(map(str, targets)), str(tgz_removed))) |
108 | 108 | ||
109 | @OETestID(977) | 109 | @OETestID(977) |
@@ -130,14 +130,14 @@ class SStateTests(SStateBase): | |||
130 | bitbake(['-ccleansstate'] + targets) | 130 | bitbake(['-ccleansstate'] + targets) |
131 | 131 | ||
132 | bitbake(targets) | 132 | bitbake(targets) |
133 | results = self.search_sstate('|'.join(map(str, [s + '.*?\.tgz$' for s in targets])), distro_specific=False, distro_nonspecific=True) | 133 | results = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific=False, distro_nonspecific=True) |
134 | filtered_results = [] | 134 | filtered_results = [] |
135 | for r in results: | 135 | for r in results: |
136 | if r.endswith(("_populate_lic.tgz", "_populate_lic.tgz.siginfo")): | 136 | if r.endswith(("_populate_lic.tgz", "_populate_lic.tgz.siginfo")): |
137 | continue | 137 | continue |
138 | filtered_results.append(r) | 138 | filtered_results.append(r) |
139 | self.assertTrue(filtered_results == [], msg="Found distro non-specific sstate for: %s (%s)" % (', '.join(map(str, targets)), str(filtered_results))) | 139 | self.assertTrue(filtered_results == [], msg="Found distro non-specific sstate for: %s (%s)" % (', '.join(map(str, targets)), str(filtered_results))) |
140 | file_tracker_1 = self.search_sstate('|'.join(map(str, [s + '.*?\.tgz$' for s in targets])), distro_specific=True, distro_nonspecific=False) | 140 | file_tracker_1 = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific=True, distro_nonspecific=False) |
141 | self.assertTrue(len(file_tracker_1) >= len(targets), msg = "Not all sstate files ware created for: %s" % ', '.join(map(str, targets))) | 141 | self.assertTrue(len(file_tracker_1) >= len(targets), msg = "Not all sstate files ware created for: %s" % ', '.join(map(str, targets))) |
142 | 142 | ||
143 | self.track_for_cleanup(self.distro_specific_sstate + "_old") | 143 | self.track_for_cleanup(self.distro_specific_sstate + "_old") |
@@ -146,7 +146,7 @@ class SStateTests(SStateBase): | |||
146 | 146 | ||
147 | bitbake(['-cclean'] + targets) | 147 | bitbake(['-cclean'] + targets) |
148 | bitbake(targets) | 148 | bitbake(targets) |
149 | file_tracker_2 = self.search_sstate('|'.join(map(str, [s + '.*?\.tgz$' for s in targets])), distro_specific=True, distro_nonspecific=False) | 149 | file_tracker_2 = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific=True, distro_nonspecific=False) |
150 | self.assertTrue(len(file_tracker_2) >= len(targets), msg = "Not all sstate files ware created for: %s" % ', '.join(map(str, targets))) | 150 | self.assertTrue(len(file_tracker_2) >= len(targets), msg = "Not all sstate files ware created for: %s" % ', '.join(map(str, targets))) |
151 | 151 | ||
152 | not_recreated = [x for x in file_tracker_1 if x not in file_tracker_2] | 152 | not_recreated = [x for x in file_tracker_1 if x not in file_tracker_2] |
@@ -192,18 +192,18 @@ class SStateTests(SStateBase): | |||
192 | if not sstate_arch in sstate_archs_list: | 192 | if not sstate_arch in sstate_archs_list: |
193 | sstate_archs_list.append(sstate_arch) | 193 | sstate_archs_list.append(sstate_arch) |
194 | if target_config[idx] == target_config[-1]: | 194 | if target_config[idx] == target_config[-1]: |
195 | target_sstate_before_build = self.search_sstate(target + '.*?\.tgz$') | 195 | target_sstate_before_build = self.search_sstate(target + r'.*?\.tgz$') |
196 | bitbake("-cclean %s" % target) | 196 | bitbake("-cclean %s" % target) |
197 | result = bitbake(target, ignore_status=True) | 197 | result = bitbake(target, ignore_status=True) |
198 | if target_config[idx] == target_config[-1]: | 198 | if target_config[idx] == target_config[-1]: |
199 | target_sstate_after_build = self.search_sstate(target + '.*?\.tgz$') | 199 | target_sstate_after_build = self.search_sstate(target + r'.*?\.tgz$') |
200 | expected_remaining_sstate += [x for x in target_sstate_after_build if x not in target_sstate_before_build if not any(pattern in x for pattern in ignore_patterns)] | 200 | expected_remaining_sstate += [x for x in target_sstate_after_build if x not in target_sstate_before_build if not any(pattern in x for pattern in ignore_patterns)] |
201 | self.remove_config(global_config[idx]) | 201 | self.remove_config(global_config[idx]) |
202 | self.remove_recipeinc(target, target_config[idx]) | 202 | self.remove_recipeinc(target, target_config[idx]) |
203 | self.assertEqual(result.status, 0, msg = "build of %s failed with %s" % (target, result.output)) | 203 | self.assertEqual(result.status, 0, msg = "build of %s failed with %s" % (target, result.output)) |
204 | 204 | ||
205 | runCmd("sstate-cache-management.sh -y --cache-dir=%s --remove-duplicated --extra-archs=%s" % (self.sstate_path, ','.join(map(str, sstate_archs_list)))) | 205 | runCmd("sstate-cache-management.sh -y --cache-dir=%s --remove-duplicated --extra-archs=%s" % (self.sstate_path, ','.join(map(str, sstate_archs_list)))) |
206 | actual_remaining_sstate = [x for x in self.search_sstate(target + '.*?\.tgz$') if not any(pattern in x for pattern in ignore_patterns)] | 206 | actual_remaining_sstate = [x for x in self.search_sstate(target + r'.*?\.tgz$') if not any(pattern in x for pattern in ignore_patterns)] |
207 | 207 | ||
208 | actual_not_expected = [x for x in actual_remaining_sstate if x not in expected_remaining_sstate] | 208 | actual_not_expected = [x for x in actual_remaining_sstate if x not in expected_remaining_sstate] |
209 | self.assertFalse(actual_not_expected, msg="Files should have been removed but ware not: %s" % ', '.join(map(str, actual_not_expected))) | 209 | self.assertFalse(actual_not_expected, msg="Files should have been removed but ware not: %s" % ', '.join(map(str, actual_not_expected))) |