Skip to content

Commit be04bf2

Browse files
committed
Merge PR ceph#57881 into main
* refs/pull/57881/head: qa/tasks/vstart_runner: avoid deprecation warning Reviewed-by: Leonid Usov <[email protected]>
2 parents ac14488 + 7658896 commit be04bf2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

qa/tasks/vstart_runner.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,13 +1222,13 @@ class LoggingResultTemplate(object):
12221222

12231223
def startTest(self, test):
12241224
log.info("Starting test: {0}".format(self.getDescription(test)))
1225-
test.started_at = datetime.datetime.utcnow()
1225+
test.started_at = datetime.datetime.now(datetime.timezone.utc)
12261226
return super(LoggingResultTemplate, self).startTest(test)
12271227

12281228
def stopTest(self, test):
12291229
log.info("Stopped test: {0} in {1}s".format(
12301230
self.getDescription(test),
1231-
(datetime.datetime.utcnow() - test.started_at).total_seconds()
1231+
(datetime.datetime.now(datetime.timezone.utc) - test.started_at).total_seconds()
12321232
))
12331233

12341234
def addSkip(self, test, reason):
@@ -1261,7 +1261,7 @@ def launch_individually(overall_suite):
12611261
if opt_rotate_logs:
12621262
logrotate = LogRotate()
12631263

1264-
started_at = datetime.datetime.utcnow()
1264+
started_at = datetime.datetime.now(datetime.timezone.utc)
12651265
for suite_, case in enumerate_methods(overall_suite):
12661266
# don't run logrotate beforehand since some ceph daemons might be
12671267
# down and pre/post-rotate scripts in logrotate.conf might fail.
@@ -1279,7 +1279,7 @@ def launch_individually(overall_suite):
12791279
no_of_tests_failed += 1
12801280

12811281
no_of_tests_execed += 1
1282-
time_elapsed = (datetime.datetime.utcnow() - started_at).total_seconds()
1282+
time_elapsed = (datetime.datetime.now(datetime.timezone.utc) - started_at).total_seconds()
12831283

12841284
if result.wasSuccessful():
12851285
log.info('')

0 commit comments

Comments
 (0)