divergent_priors: we no longer track divergent priors explicitely

The rest of the test is still valuable to ensure that we detect missing
items which are not in the log, but now that the missing set is
explicitely persisted, the divergent priors set isn't a special case
and won't have special log lines to check for.

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/tasks/divergent_priors.py b/tasks/divergent_priors.py
index 97a01244fa1d1f15708766c52ca7cc914b7f41e6..73a045775158a3de04c1f2999b7eb49d2457b55c 100644 (file)
--- a/tasks/divergent_priors.py
+++ b/tasks/divergent_priors.py
@@ -159,13 +159,4 @@ def task(ctx, config):
                                        '/tmp/existing'])
         assert exit_status is 0
 
-    (remote,) = ctx.\
-        cluster.only('osd.{o}'.format(o=divergent)).remotes.iterkeys()
-    msg = "dirty_divergent_priors: true, divergent_priors: %d" \
-          % (DIVERGENT_WRITE + DIVERGENT_REMOVE)
-    cmd = 'grep "{msg}" /var/log/ceph/ceph-osd.{osd}.log'\
-          .format(msg=msg, osd=divergent)
-    proc = remote.run(args=cmd, wait=True, check_status=False)
-    assert proc.exitstatus == 0
-
     log.info("success")

diff --git a/tasks/divergent_priors2.py b/tasks/divergent_priors2.py
index 6b384727cf8413b95a385bbbe26d587379e3af0d..939d7850930c4659defcd94ed10979ca34e449c6 100644 (file)
--- a/tasks/divergent_priors2.py
+++ b/tasks/divergent_priors2.py
@@ -193,15 +193,6 @@ def task(ctx, config):
                                        '/tmp/existing'])
         assert exit_status is 0
 
-    (remote,) = ctx.\
-        cluster.only('osd.{o}'.format(o=divergent)).remotes.iterkeys()
-    msg = "dirty_divergent_priors: true, divergent_priors: %d" \
-          % (DIVERGENT_WRITE + DIVERGENT_REMOVE)
-    cmd = 'grep "{msg}" /var/log/ceph/ceph-osd.{osd}.log'\
-          .format(msg=msg, osd=divergent)
-    proc = remote.run(args=cmd, wait=True, check_status=False)
-    assert proc.exitstatus == 0
-
     cmd = 'rm {file}'.format(file=expfile)
-    remote.run(args=cmd, wait=True)
+    exp_remote.run(args=cmd, wait=True)
     log.info("success")

diff --git a/tasks/reg11184.py b/tasks/reg11184.py
index 016057d2e3b28ea5163213bc5d63fca314c1b7cb..e4f4371b97df17c4e88a3b607affd9804a78cf41 100644 (file)
--- a/tasks/reg11184.py
+++ b/tasks/reg11184.py
@@ -230,13 +230,6 @@ def task(ctx, config):
 
     (remote,) = ctx.\
         cluster.only('osd.{o}'.format(o=divergent)).remotes.iterkeys()
-    msg = "dirty_divergent_priors: true, divergent_priors: %d" \
-          % (DIVERGENT_WRITE + DIVERGENT_REMOVE)
-    cmd = 'grep "{msg}" /var/log/ceph/ceph-osd.{osd}.log'\
-          .format(msg=msg, osd=divergent)
-    proc = remote.run(args=cmd, wait=True, check_status=False)
-    assert proc.exitstatus == 0
-
     cmd = 'rm {file}'.format(file=expfile)
     remote.run(args=cmd, wait=True)
     log.info("success")