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)

diff --git a/tox-cephadm.ini b/tox-cephadm.ini
index 0c3db9f6d776ec917df2403903bd70d61bb4c6d4..cf4ac6635a870eb840201521a2105b151d35516b 100644 (file)
--- 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 bddd6190afb5b085782b1b84ed054701d97cd98c..169577c72aae9e1af3b9ad4f9d136d4a9a1da1c6 100644 (file)
--- 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 d950546172f5c30be1cdda0b283e9a088d7291fb..3f9644aea63607fae6c531657211e40235d1159f 100644 (file)
--- 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 6c98ba10fe0ae2571a3bca825914b69eda635bce..07294dade17e5689c14aef7ddfc9eb051cc17d9e 100644 (file)
--- 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 6dc6d2def4b808cb1fd21788d65e623b1c7847fb..8d007dbdf0bef52035636a2908eba33dd88b2302 100644 (file)
--- 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