Merge "Fixes list_snapshots and _with_details methods in snap XML client"
diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index 12f7cc3..915e2fa 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -309,7 +309,7 @@
# Instance type for tests. Needs to be big enough for a
# full OS plus the test workload
-instance_type = m1.tiny
+instance_type = m1.micro
# Name of heat-cfntools enabled image to use when launching test instances
# If not specified, tests that spawn instances will not run
diff --git a/tempest/tests/compute/test_auth_token.py b/tempest/api/compute/test_auth_token.py
similarity index 97%
rename from tempest/tests/compute/test_auth_token.py
rename to tempest/api/compute/test_auth_token.py
index ca319a1..bbe92ef 100644
--- a/tempest/tests/compute/test_auth_token.py
+++ b/tempest/api/compute/test_auth_token.py
@@ -15,8 +15,8 @@
import testtools
+from tempest.api.compute import base
import tempest.config as config
-from tempest.tests.compute import base
class AuthTokenTestJSON(base.BaseComputeTest):
diff --git a/tempest/config.py b/tempest/config.py
index 150d561..85be7a6 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -388,7 +388,7 @@
default=False,
help="Whether or not Heat is expected to be available"),
cfg.StrOpt('instance_type',
- default='m1.tiny',
+ default='m1.micro',
help="Instance type for tests. Needs to be big enough for a "
"full OS plus the test workload"),
cfg.StrOpt('image_ref',
diff --git a/tempest/hacking/checks.py b/tempest/hacking/checks.py
index 353a9ac..93cf89d 100644
--- a/tempest/hacking/checks.py
+++ b/tempest/hacking/checks.py
@@ -53,6 +53,16 @@
" in tempest/api/* tests"))
+def import_no_files_in_tests(physical_line, filename):
+ """Check for merges that try to land into tempest/tests
+
+ T103: tempest/tests directory is deprecated
+ """
+
+ if "tempest/tests" in filename:
+ return (0, ("T103: tempest/tests is deprecated"))
+
+
def factory(register):
register(skip_bugs)
register(import_no_clients_in_api)
diff --git a/tox.ini b/tox.ini
index e31e43d..634b7df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,18 @@
NOSE_OPENSTACK_SHOW_ELAPSED=1
NOSE_OPENSTACK_STDOUT=1
+[testenv:all]
+sitepackages = True
+setenv = VIRTUAL_ENV={envdir}
+ NOSE_WITH_OPENSTACK=1
+ NOSE_OPENSTACK_COLOR=1
+ NOSE_OPENSTACK_RED=15
+ NOSE_OPENSTACK_YELLOW=3
+ NOSE_OPENSTACK_SHOW_ELAPSED=1
+ NOSE_OPENSTACK_STDOUT=1
+commands =
+ nosetests --logging-format '%(asctime)-15s %(message)s' --with-xunit --xunit-file=nosetests-all.xml -sv tempest
+
[testenv:full]
sitepackages = True
setenv = VIRTUAL_ENV={envdir}