Merge "Add test for quota set for invalid project"
diff --git a/.gitignore b/.gitignore
index a6a0b0b..8c8997c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@
*.log
.coverage
.coverage.*
-/.testrepository/*
+.stestr/
.tox
.venv
cover
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..9006406
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./designate_tempest_plugin}
+top_dir=./
+
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index fee97eb..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
- OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
- OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \
- OS_DEBUG=${OS_DEBUG:-1} \
- OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \
- OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \
- ${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./designate_tempest_plugin} $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list
-group_regex=([^\.]*\.)*
diff --git a/.zuul.yaml b/.zuul.yaml
index 64c99f4..9cc66cf 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,11 @@
- project:
templates:
- designate-devstack-jobs
+ - check-requirements
+ - publish-openstack-docs-pti
+ - tempest-plugin-jobs
check:
jobs:
- neutron-tempest-plugin-designate-scenario
+ gate:
+ queue: designate
diff --git a/designate_tempest_plugin/config.py b/designate_tempest_plugin/config.py
index f81b8e9..2f97565 100644
--- a/designate_tempest_plugin/config.py
+++ b/designate_tempest_plugin/config.py
@@ -82,7 +82,7 @@
help="Is project IDs verified when setting v2 quotas. "
"Must be set to True starting from Rocky release."),
cfg.BoolOpt('bug_1573141_fixed',
- default=False,
+ default=True,
help="Is https://bugs.launchpad.net/designate/+bug/1573141 "
"fixed"),
]
diff --git a/doc/source/conf.py b/doc/source/conf.py
index d6ccf8e..fa9065a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -127,7 +127,7 @@
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index ac57e68..82eda14 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -245,7 +245,7 @@
@decorators.attr
-~~~~~~~~~~
+~~~~~~~~~~~~~~~~
The `attr` decorator is used to set test attributes, this is most commonly used
to set the test type. Currently, we use one test type "smoke", which should be
diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
deleted file mode 100755
index 0fc3605..0000000
--- a/tools/pretty_tox.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-TESTRARGS=$1
-
-exec 3>&1
-status=$(exec 4>&1 >&3; ( python setup.py testr --slowest --testr-args="--subunit $TESTRARGS"; echo $? >&4 ) | subunit-trace -f) && exit $status
diff --git a/tox.ini b/tox.ini
index f183956..4d9c7df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@
rm
commands =
find . -type f -name "*.pyc" -delete
- sh tools/pretty_tox.sh '{posargs}'
+ stestr run {posargs}
passenv = http_proxy
HTTP_PROXY
https_proxy