From 99fe9d48e6a28e75f104ce1f2e00f0151192cc11 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Mon, 12 Sep 2022 18:32:36 +0100
Subject: [PATCH] tests: Print task durations

---
 tests/ansible/ansible.cfg                   | 11 ++-
 tests/ansible/lib/callback/profile_tasks.py | 82 ---------------------
 2 files changed, 7 insertions(+), 86 deletions(-)
 delete mode 100644 tests/ansible/lib/callback/profile_tasks.py

diff --git a/tests/ansible/ansible.cfg b/tests/ansible/ansible.cfg
index ad58a781..a6bc5312 100644
--- a/tests/ansible/ansible.cfg
+++ b/tests/ansible/ansible.cfg
@@ -1,5 +1,12 @@
 [defaults]
 any_errors_fatal = true
+# callback_whitelist naming will be deprecated in ansible-core >= 2.15.
+# callbacks_enabled naming was added in ansible-core 2.11
+# profile_tasks: Displays timing for each task and summary table of top N tasks
+# timer: Displays "Playbook run took 0 days, 0 hours, ..."
+callback_whitelist =
+    profile_tasks,
+    timer
 inventory = hosts
 gathering = explicit
 strategy_plugins = ../../ansible_mitogen/plugins/strategy
@@ -7,10 +14,6 @@ inventory_plugins = lib/inventory
 action_plugins = lib/action
 callback_plugins = lib/callback
 stdout_callback = yaml
-stdout_whitelist =
-    profile_roles,
-    timer,
-    yaml
 vars_plugins = lib/vars
 library = lib/modules
 filter_plugins = lib/filters
diff --git a/tests/ansible/lib/callback/profile_tasks.py b/tests/ansible/lib/callback/profile_tasks.py
deleted file mode 100644
index 89d956ac..00000000
--- a/tests/ansible/lib/callback/profile_tasks.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# profile_tasks.py: an Ansible plugin for timing tasks
-
-# Copyright (C) 2014 Jharrod LaFon <jharrod.lafon@gmail.com>
-# https://github.com/jlafon/ansible-profile/
-# Included with permission
-
-
-# The MIT License (MIT)
-#
-# Copyright (c) 2014 Jharrod LaFon
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-
-from ansible.plugins.callback import CallbackBase
-import time
-
-
-class CallbackModule(CallbackBase):
-    """
-    A plugin for timing tasks
-    """
-    def __init__(self):
-        super(CallbackModule, self).__init__()
-        self.stats = {}
-        self.current = None
-
-    def playbook_on_task_start(self, name, is_conditional):
-        """
-        Logs the start of each task
-        """
-        if self.current is not None:
-            # Record the running time of the last executed task
-            self.stats[self.current] = time.time() - self.stats[self.current]
-
-        # Record the start time of the current task
-        self.current = name
-        self.stats[self.current] = time.time()
-
-    called = False
-
-    def playbook_on_stats(self, stats):
-        """
-        Prints the timings
-        """
-        if CallbackModule.called:
-            return
-        CallbackModule.called = True
-
-        # Record the timing of the very last task
-        if self.current is not None:
-            self.stats[self.current] = time.time() - self.stats[self.current]
-
-        # Sort the tasks by their running time
-        results = sorted(self.stats.items(),
-                         key=lambda value: value[1], reverse=True)
-
-        # Just keep the top 10
-        results = results[:10]
-
-        # Print the timings
-        for name, elapsed in results:
-            print("{0:-<70}{1:->9}".format(
-                    '{0} '.format(name),
-                    ' {0:.02f}s'.format(elapsed)))
-