diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/runtime/systemd.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/meta/lib/oeqa/runtime/systemd.py b/meta/lib/oeqa/runtime/systemd.py index 03c56ef9f0..2b2f10d71c 100644 --- a/meta/lib/oeqa/runtime/systemd.py +++ b/meta/lib/oeqa/runtime/systemd.py | |||
@@ -145,8 +145,7 @@ class SystemdJournalTests(SystemdTest): | |||
145 | except AssertionError: | 145 | except AssertionError: |
146 | self.fail("Error occurred while calling journalctl") | 146 | self.fail("Error occurred while calling journalctl") |
147 | if not len(output): | 147 | if not len(output): |
148 | self.fail("Error: unable to obtain the startup time from\ | 148 | self.fail("Error, unable to get startup time from systemd journal") |
149 | systemd journal") | ||
150 | 149 | ||
151 | # check for the regular expression items that match the startup time | 150 | # check for the regular expression items that match the startup time |
152 | for line in output.split('\n'): | 151 | for line in output.split('\n'): |
@@ -156,20 +155,23 @@ class SystemdJournalTests(SystemdTest): | |||
156 | if check_match: | 155 | if check_match: |
157 | print "%s" % check_match | 156 | print "%s" % check_match |
158 | else: | 157 | else: |
159 | self.fail("Error while obtaining the boot time from journalctl") | 158 | self.skipTest("Error at obtaining the boot time from journalctl") |
160 | boot_time_sec = 0 | 159 | boot_time_sec = 0 |
161 | 160 | ||
162 | # get the numeric values from the string and convert them to seconds | 161 | # get the numeric values from the string and convert them to seconds |
163 | # same data will be placed in list and string for manipulation | 162 | # same data will be placed in list and string for manipulation |
164 | l_boot_time = check_match.split(" ")[-2:] | 163 | l_boot_time = check_match.split(" ")[-2:] |
165 | s_boot_time = " ".join(l_boot_time) | 164 | s_boot_time = " ".join(l_boot_time) |
166 | # Obtain the minutes it took to boot | 165 | try: |
167 | if l_boot_time[0].endswith('min') and l_boot_time[0][0].isdigit(): | 166 | # Obtain the minutes it took to boot |
168 | boot_time_min = s_boot_time.split("min")[0] | 167 | if l_boot_time[0].endswith('min') and l_boot_time[0][0].isdigit(): |
169 | # convert to seconds and accumulate it | 168 | boot_time_min = s_boot_time.split("min")[0] |
170 | boot_time_sec += int(boot_time_min) * 60 | 169 | # convert to seconds and accumulate it |
171 | # Obtain the seconds it took to boot and accumulate | 170 | boot_time_sec += int(boot_time_min) * 60 |
172 | boot_time_sec += float(l_boot_time[1].split("s")[0]) | 171 | # Obtain the seconds it took to boot and accumulate |
172 | boot_time_sec += float(l_boot_time[1].split("s")[0]) | ||
173 | except ValueError: | ||
174 | self.skipTest("Error when parsing time from boot string") | ||
173 | #Assert the target boot time against systemd's unit start timeout | 175 | #Assert the target boot time against systemd's unit start timeout |
174 | if boot_time_sec > systemd_TimeoutStartSec: | 176 | if boot_time_sec > systemd_TimeoutStartSec: |
175 | print "Target boot time %s exceeds systemd's TimeoutStartSec %s"\ | 177 | print "Target boot time %s exceeds systemd's TimeoutStartSec %s"\ |