openstack/trove
Code Issues Proposed changes

Merge "Raise timeout for instance resizing checking job"

Browse Source
This commit is contained in:
Zuul 2018-07-11 16:37:22 +00:00 committed by Gerrit Code Review
commit e2b1e23cf1
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/legacy/trove-functional-dsvm-mysql/run.yaml
View File

@ -30,6 +30,7 @@
cat << 'EOF' >>"/tmp/dg-local.conf" cat << 'EOF' >>"/tmp/dg-local.conf"
[[local|localrc]] [[local|localrc]]
enable_plugin trove git://git.openstack.org/openstack/trove enable_plugin trove git://git.openstack.org/openstack/trove
TROVE_RESIZE_TIME_OUT=1800
EOF EOF
executable: /bin/bash executable: /bin/bash
@ -56,6 +57,7 @@
export DEST=$BASE/new export DEST=$BASE/new
export PATH_DEVSTACK_SRC=$DEST/devstack export PATH_DEVSTACK_SRC=$DEST/devstack
cd /opt/stack/new/trove/integration/scripts cd /opt/stack/new/trove/integration/scripts
export TROVE_RESIZE_TIME_OUT=1800
./trovestack dsvm-gate-tests mysql ./trovestack dsvm-gate-tests mysql
} }
export -f post_test_hook export -f post_test_hook

14
trove/tests/api/instances_actions.py
View File

@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import os
import time import time
from proboscis import after_class from proboscis import after_class
@ -26,6 +27,7 @@ from sqlalchemy.sql.expression import text
from troveclient.compat.exceptions import BadRequest from troveclient.compat.exceptions import BadRequest
from troveclient.compat.exceptions import HTTPNotImplemented from troveclient.compat.exceptions import HTTPNotImplemented
from trove.common import cfg
from trove.common.utils import poll_until from trove.common.utils import poll_until
from trove import tests from trove import tests
from trove.tests.api.instances import assert_unprocessable from trove.tests.api.instances import assert_unprocessable
@ -86,7 +88,17 @@ class MySqlConnection(object):
raise ex raise ex
TIME_OUT_TIME = 15 * 60 # Use default value from trove.common.cfg, and it could be overridden by
# a environment variable when the tests run.
def get_resize_timeout():
value_from_env = os.environ.get("TROVE_RESIZE_TIME_OUT", None)
if value_from_env:
return int(value_from_env)
return cfg.CONF.resize_time_out
TIME_OUT_TIME = get_resize_timeout()
USER_WAS_DELETED = False USER_WAS_DELETED = False