Merge "Removed unused imports; whitespace normalization"
diff --git a/README.rst b/README.rst
index c027b1a..f00ce6c 100644
--- a/README.rst
+++ b/README.rst
@@ -16,6 +16,7 @@
run_tests.sh --nova
run_tests.sh --glance
run_tests.sh --swift
+ run_tests.sh --auth
Additional Info
diff --git a/kong/run_tests.sh b/kong/run_tests.sh
index 96c2406..f666fbd 100755
--- a/kong/run_tests.sh
+++ b/kong/run_tests.sh
@@ -8,9 +8,10 @@
echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment"
echo " -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added."
echo " -p, --pep8 Just run pep8"
- echo " --nova Run all tests tagged as \"nova\"."
- echo " --swift Run all tests tagged as \"swift\"."
- echo " --glance Run all tests tagged as \"glance\"."
+ echo " --nova Run all tests tagged as \"nova\"."
+ echo " --swift Run all tests tagged as \"swift\"."
+ echo " --glance Run all tests tagged as \"glance\"."
+ echo " --auth Run all tests tagged as \"auth\"."
echo " -h, --help Print this usage message"
echo ""
echo "Note: with no options specified, the script will try to run the tests in a virtual environment,"
@@ -29,6 +30,7 @@
--nova) noseargs="$noseargs -a tags=nova";;
--glance) noseargs="$noseargs -a tags=glance";;
--swift) noseargs="$noseargs -a tags=swift";;
+ --auth) noseargs="$noseargs -a tags=auth";;
*) noseargs="$noseargs $1"
esac
}
diff --git a/kong/tests/test_auth.py b/kong/tests/test_auth.py
index bc040a8..2e2546a 100644
--- a/kong/tests/test_auth.py
+++ b/kong/tests/test_auth.py
@@ -19,8 +19,6 @@
import httplib2
import json
-import os
-import time
import uuid
from kong import keystone
@@ -67,6 +65,10 @@
self.assertEqual(response.status, 200)
res_body = json.loads(content)
self.assertTrue(res_body['access']['token']['id'])
+ self.assertTrue(res_body['access']['token']['tenant']['id'],
+ self.tenant_id)
+ self.assertTrue(res_body['access']['user']['name'],
+ self.user)
test_can_get_token.tags = ['auth']
def test_bad_user(self):