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>

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 ee28ab8a5f98067784bc6b7a8d9bc25551a93f36..2462938a21b33fad420298e0cf9dcf8a071d8a31 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 8a031d21e7fd8bcde8380228972ce576c46d2d6d..710343b8e8466d2b608569737008542cf5359651 100644 (file)
--- a/tox-podman.ini
+++ b/tox-podman.ini
@@ -8,7 +8,6 @@ whitelist_externals =
     vagrant
     bash
     pip
-    sleep
     rm
 passenv=*
 sitepackages=True
@@ -49,16 +48,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 691bac449465c76fa23c5e785de47d86a3c8e09c..8ddbeed5ce1dc54d87caeb78af1a58b478bee22f 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=
@@ -102,8 +101,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 c580e639ccf4140768af7c699a2ba6cdd6358d35..8b700b8066a85dbd66dc593fe00c5d706c41b6a9 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -277,7 +277,6 @@ whitelist_externals =
     vagrant
     bash
     pip
-    sleep
     rm
 passenv=*
 sitepackages=False
@@ -366,16 +365,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
 
   # reboot all vms
   all_daemons: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml
 
-  # wait 30sec for services to be ready
-  all_daemons,all_in_one: sleep 30
   # retest to ensure cluster came back up correctly after rebooting
   all_daemons: 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