From 68093df0df2c3b9765cf5ca1728cfee12da322bc Mon Sep 17 00:00:00 2001 From: Keith Holman Date: Wed, 4 Jun 2014 11:34:02 -0400 Subject: keystone: remove git commands from tests When running the keystone tests, the tests ensures that keystone is being tested against the latest version of keystone-client available by downloading keystone-client from source using git. However, on the target system keystone-client is installed as a separate package and it is undesirable to download a newer version to test against. This fix comments out the portion of the testing code that attempts to retrieve keystone-client from source code using git. Signed-off-by: Keith Holman --- .../keystone-remove-git-commands-in-tests.patch | 42 ++++++++++++++++++++++ .../recipes-devtools/python/python-keystone_git.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch (limited to 'meta-openstack/recipes-devtools/python') diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch b/meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch new file mode 100644 index 0000000..5605950 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch @@ -0,0 +1,42 @@ +From d2ee135a3c97f714e6da59adf45a91a2f1632057 Mon Sep 17 00:00:00 2001 +From: Keith Holman +Date: Wed, 4 Jun 2014 11:30:53 -0400 +Subject: [PATCH] keystone: remove git commands in tests + +Keystone tests are designed to be used during development +and will use git to download the latest keystoneclient from +source to test against. However, on the system installation +we install keystone-client as a separate package, and do not +want to download an external version to test. In order to +test against the version installed as a separate package, +remove the git calls that clone the keystone-client repository +and just returned the desired directory. + +Signed-off-by: Keith Holman +--- + keystone/tests/core.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/keystone/tests/core.py b/keystone/tests/core.py +index 860f68d..9aa54db 100644 +--- a/keystone/tests/core.py ++++ b/keystone/tests/core.py +@@ -109,6 +109,7 @@ def checkout_vendor(repo, rev): + + working_dir = os.getcwd() + revdir = os.path.join(VENDOR, '%s-%s' % (name, rev.replace('/', '_'))) ++ """ + modcheck = os.path.join(VENDOR, '.%s-%s' % (name, rev.replace('/', '_'))) + try: + if os.path.exists(modcheck): +@@ -129,6 +130,7 @@ def checkout_vendor(repo, rev): + fd.write('1') + except environment.subprocess.CalledProcessError: + LOG.warning(_('Failed to checkout %s'), repo) ++ """ + cd(working_dir) + return revdir + +-- +1.9.3 + diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index e37e658..9360aae 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ file://openrc \ file://keystone-search-in-etc-directory-for-config-files.patch \ file://keystone-fix-location-of-files-for-tests.patch \ + file://keystone-remove-git-commands-in-tests.patch \ " SRCREV="a96d1a44bc0f074729c312e5c2a0f0875edf1765" -- cgit v1.2.3-54-g00ecf