Merge lp:~yolanda.robla/keystone/havana into lp:~openstack-ubuntu-testing/keystone/havana

[Yolanda Robla]

Added autopkgtests

[Chuck Short (zulcss)]

debian/tests/test_import_keystone.py why are you importing nova when you are testing keystone?

review: Needs Fixing

[lp:~yolanda.robla/keystone/havana]

200. By Yolanda Robla on 2013-06-03

modified import keystone

[Yolanda Robla (yolanda.robla)]

You are right, I missed the commit of that change. Recheck

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 19:23:59 +0000
+++ debian/changelog	2013-06-03 14:13:45 +0000
@@ -1,8 +1,12 @@
-keystone (1:2013.2~b1-0ubuntu2) UNRELEASED; urgency=low
+keystone (1:2013.2~b1-0ubuntu2) saucy; urgency=low
 
+  [ Adam Gandelman ]
   * debian/patches/*: Refresh
 
- -- Adam Gandelman <[e-mail]>  Fri, 31 May 2013 12:23:14 -0700
+  [ Yolanda Robla ]
+  * debian/tests: added autopkgtests
+
+ -- Yolanda Robla <[e-mail]>  Mon, 03 Jun 2013 14:57:00 +0100
 
 keystone (1:2013.2~b1-0ubuntu1) saucy; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-05-28 14:16:26 +0000
+++ debian/control	2013-06-03 14:13:45 +0000
@@ -34,6 +34,7 @@
 XS-Python-Version: >= 2.6
 Homepage: http://launchpad.net/keystone
 Vcs-Bzr: https://code.launchpad.net/~openstack-ubuntu-testing/keystone/grizzly
+XS-Testsuite: autopkgtest
 
 Package: python-keystone
 Architecture: all

=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-06-03 14:13:45 +0000
@@ -0,0 +1,3 @@
+Tests: python-keystone keystone-daemon
+Depends: python-keystone, keystone
+Restrictions: needs-root

=== added file 'debian/tests/keystone-daemon'
--- debian/tests/keystone-daemon	1970-01-01 00:00:00 +0000
+++ debian/tests/keystone-daemon	2013-06-03 14:13:45 +0000
@@ -0,0 +1,18 @@
+#!/bin/bash
+#------------------------
+# Testing keystone-daemon
+#------------------------
+set -e
+
+# first copy the keystone-paste.ini file
+cp `dirname $0`/keystone-paste.ini /etc/keystone/
+
+DAEMONS=('keystone-all')
+
+service keystone start > /dev/null
+if pidof -x keystone-all > /dev/null; then
+    echo "OK"
+else
+    echo "ERROR: ${daemon} IS NOT RUNNING"
+    exit 1
+fi

=== added file 'debian/tests/keystone-paste.ini'
--- debian/tests/keystone-paste.ini	1970-01-01 00:00:00 +0000
+++ debian/tests/keystone-paste.ini	2013-06-03 14:13:45 +0000
@@ -0,0 +1,85 @@
+# Keystone PasteDeploy configuration file.
+
+[filter:debug]
+paste.filter_factory = keystone.common.wsgi:Debug.factory
+
+[filter:token_auth]
+paste.filter_factory = keystone.middleware:TokenAuthMiddleware.factory
+
+[filter:admin_token_auth]
+paste.filter_factory = keystone.middleware:AdminTokenAuthMiddleware.factory
+
+[filter:xml_body]
+paste.filter_factory = keystone.middleware:XmlBodyMiddleware.factory
+
+[filter:json_body]
+paste.filter_factory = keystone.middleware:JsonBodyMiddleware.factory
+
+[filter:user_crud_extension]
+paste.filter_factory = keystone.contrib.user_crud:CrudExtension.factory
+
+[filter:crud_extension]
+paste.filter_factory = keystone.contrib.admin_crud:CrudExtension.factory
+
+[filter:ec2_extension]
+paste.filter_factory = keystone.contrib.ec2:Ec2Extension.factory
+
+[filter:s3_extension]
+paste.filter_factory = keystone.contrib.s3:S3Extension.factory
+
+[filter:url_normalize]
+paste.filter_factory = keystone.middleware:NormalizingFilter.factory
+
+[filter:sizelimit]
+paste.filter_factory = keystone.middleware:RequestBodySizeLimiter.factory
+
+[filter:stats_monitoring]
+paste.filter_factory = keystone.contrib.stats:StatsMiddleware.factory
+
+[filter:stats_reporting]
+paste.filter_factory = keystone.contrib.stats:StatsExtension.factory
+
+[filter:access_log]
+paste.filter_factory = keystone.contrib.access:AccessLogMiddleware.factory
+
+[app:public_service]
+paste.app_factory = keystone.service:public_app_factory
+
+[app:service_v3]
+paste.app_factory = keystone.service:v3_app_factory
+
+[app:admin_service]
+paste.app_factory = keystone.service:admin_app_factory
+
+[pipeline:public_api]
+pipeline = access_log sizelimit url_normalize token_auth admin_token_auth xml_body json_body ec2_extension user_crud_extension public_service
+
+[pipeline:admin_api]
+pipeline = access_log sizelimit url_normalize token_auth admin_token_auth xml_body json_body ec2_extension s3_extension crud_extension admin_service
+
+[pipeline:api_v3]
+pipeline = access_log sizelimit url_normalize token_auth admin_token_auth xml_body json_body ec2_extension s3_extension service_v3
+
+[app:public_version_service]
+paste.app_factory = keystone.service:public_version_app_factory
+
+[app:admin_version_service]
+paste.app_factory = keystone.service:admin_version_app_factory
+
+[pipeline:public_version_api]
+pipeline = access_log sizelimit url_normalize xml_body public_version_service
+
+[pipeline:admin_version_api]
+pipeline = access_log sizelimit url_normalize xml_body admin_version_service
+
+[composite:main]
+use = egg:Paste#urlmap
+/v2.0 = public_api
+/v3 = api_v3
+/ = public_version_api
+
+[composite:admin]
+use = egg:Paste#urlmap
+/v2.0 = admin_api
+/v3 = api_v3
+/ = admin_version_api

=== added file 'debian/tests/python-keystone'
--- debian/tests/python-keystone	1970-01-01 00:00:00 +0000
+++ debian/tests/python-keystone	2013-06-03 14:13:45 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-------------------------
+# Testing client utilities
+#-------------------------
+set -e
+
+result=$(python `dirname $0`/test_import_keystone.py 2>&1)
+if [ "$result" ]; then
+    echo "ERROR: PYTHON-KEYSTONE MODULE CANNOT BE IMPORTED"
+    exit 1
+else
+    echo "OK"
+    exit 0
+fi

=== added file 'debian/tests/test_import_keystone.py'
--- debian/tests/test_import_keystone.py	1970-01-01 00:00:00 +0000
+++ debian/tests/test_import_keystone.py	2013-06-03 14:13:45 +0000
@@ -0,0 +1,4 @@
+try:
+    import keystone
+except ImportError, e:
+    print "ERROR IMPORTING MODULE"

=== removed file 'debian/tests/test_overrides.conf'
--- debian/tests/test_overrides.conf	2013-04-05 20:24:50 +0000
+++ debian/tests/test_overrides.conf	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-[DEFAULT]
-crypt_strength = 10
-
-[identity]
-driver = keystone.identity.backends.kvs.Identity
-
-[catalog]
-driver = keystone.catalog.backends.templated.TemplatedCatalog
-template_file =  default_catalog.templates
-
-[trust]
-driver = keystone.trust.backends.kvs.Trust
-
-[token]
-driver = keystone.token.backends.kvs.Token
-
-[policy]
-driver = keystone.policy.backends.rules.Policy
-
-[ec2]
-driver = keystone.contrib.ec2.backends.kvs.Ec2
-
-[signing]
-certfile = ../examples/pki/certs/signing_cert.pem
-keyfile = ../examples/pki/private/signing_key.pem
-ca_certs = ../examples/pki/certs/cacert.pem