Merge pull request #38107 from ceph/wip-mgr-progress-fix-48217

qa/mgr/test_progress: add _get_osd_in_out_events to account for osd marked in/out events

Reviewed-by: Neha Ojha <nojha@redhat.com>

diff --cc qa/tasks/mgr/test_progress.py
index e64d23aa7ba7c4b6b13d994109bd568c6365b68f,7f841e7fd8f6b96fccf9e530a4f52dec7d831986..0e03c2b663acfeba31071147fad9630714c5ff63
--- 1/qa/tasks/mgr/test_progress.py
--- 2/qa/tasks/mgr/test_progress.py
+++ b/qa/tasks/mgr/test_progress.py
@@@ -213,17 -215,9 +215,17 @@@ class TestProgress(MgrTestCase)
              log.info("There was no PGs affected by osd being marked in")
              return None
  
-         new_event = self._events_in_progress()[0]
+         new_event = self._get_osd_in_out_events('in')[0]
          return new_event
  
 +    def _no_events_anywhere(self):
 +        """
 +        Whether there are any live or completed events
 +        """
 +        p = self._get_progress()
 +        total_events = len(p['events']) + len(p['completed'])
 +        return total_events == 0
 +
      def _is_quiet(self):
          """
          Whether any progress events are live.