From dbd53a2ef28fdf5bab67608d57d62c3610967ff5 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 30 Sep 2020 17:59:39 +0200
Subject: [PATCH] tests: remove sleep commands from tox ini files

Since we use the rerun plugin in tox, we shouldn't need to add these
`sleep` commands.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit e835c77a0e705e69776362cd643acf9cb442ea0c)
---
 tox-cephadm.ini       | 1 -
 tox-docker2podman.ini | 1 -
 tox-podman.ini        | 5 -----
 tox-shrink_osd.ini    | 3 ---
 tox.ini               | 5 -----
 5 files changed, 15 deletions(-)

diff --git a/tox-cephadm.ini b/tox-cephadm.ini
index 0c3db9f6d..cf4ac6635 100644
--- a/tox-cephadm.ini
+++ b/tox-cephadm.ini
@@ -8,7 +8,6 @@ whitelist_externals =
     vagrant
     bash
     pip
-    sleep
     rm
 passenv=*
 sitepackages=True
diff --git a/tox-docker2podman.ini b/tox-docker2podman.ini
index bddd6190a..169577c72 100644
--- a/tox-docker2podman.ini
+++ b/tox-docker2podman.ini
@@ -8,7 +8,6 @@ whitelist_externals =
     vagrant
     bash
     pip
-    sleep
     rm
 passenv=*
 sitepackages=True
diff --git a/tox-podman.ini b/tox-podman.ini
index d95054617..3f9644aea 100644
--- a/tox-podman.ini
+++ b/tox-podman.ini
@@ -8,7 +8,6 @@ whitelist_externals =
     vagrant
     bash
     pip
-    sleep
     rm
 passenv=*
 sitepackages=True
@@ -47,16 +46,12 @@ commands=
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
   "
 
-  # wait 30sec for services to be ready
-  sleep 30
   # test cluster state using ceph-ansible tests
   py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
-  # wait 30sec for services to be ready
 
   # reboot all vms
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml
 
-  # wait 30sec for services to be ready
   # retest to ensure cluster came back up correctly after rebooting
   py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
 
diff --git a/tox-shrink_osd.ini b/tox-shrink_osd.ini
index 6c98ba10f..07294dade 100644
--- a/tox-shrink_osd.ini
+++ b/tox-shrink_osd.ini
@@ -48,7 +48,6 @@ commands=
 whitelist_externals =
     vagrant
     bash
-    sleep
 passenv=*
 sitepackages=False
 setenv=
@@ -98,8 +97,6 @@ commands=
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
   "
 
-  # wait 30sec for services to be ready
-  sleep 30
   # test cluster state using ceph-ansible tests
   py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
 
diff --git a/tox.ini b/tox.ini
index 6dc6d2def..8d007dbdf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -314,7 +314,6 @@ whitelist_externals =
     vagrant
     bash
     pip
-    sleep
     rm
 passenv=*
 sitepackages=False
@@ -403,16 +402,12 @@ commands=
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
   "
 
-  # wait 30sec for services to be ready
-  sleep 30
   # test cluster state using ceph-ansible tests
   py.test --reruns 20 --reruns-delay 3 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
 
   # reboot all vms
   all_daemons,collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml
 
-  # wait 30sec for services to be ready
-  sleep 30
   # retest to ensure cluster came back up correctly after rebooting
   all_daemons,collocation: py.test --reruns 20 --reruns-delay 3 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests