Hello community,
here is the log from the commit of package openstack-tempest for
openSUSE:Factory checked in at 2014-01-20 07:52:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-tempest (Old)
and /work/SRC/openSUSE:Factory/.openstack-tempest.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-tempest"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-tempest/openstack-tempest.changes
2013-11-20 11:12:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openstack-tempest.new/openstack-tempest.changes
2014-01-23 15:50:48.000000000 +0100
@@ -1,0 +2,41 @@
+Tue Jan 14 11:06:09 UTC 2014 - dmuel...@suse.com
+
+- fix requires
+
+-------------------------------------------------------------------
+Mon Jan 13 12:11:01 UTC 2014 - dmuel...@suse.com
+
+- add a run_tempest.sh wrapper for Icehouse compatibility
+
+-------------------------------------------------------------------
+Thu Jan 9 10:56:32 UTC 2014 - dmuel...@suse.com
+
+- add 0001-Make-test_show_host_detail-work-with-multi-host-inst.patch
(bnc#855862)
+
+-------------------------------------------------------------------
+Fri Dec 20 11:13:03 UTC 2013 - dmuel...@suse.com
+
+- Improve default tempest config
+
+-------------------------------------------------------------------
+Thu Dec 19 01:31:58 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.dev2027.g4dabfe3:
+ + Update to latest pbr
+ + Updated from global requirements
+ + Have tox install via setup.py develop
+
+-------------------------------------------------------------------
+Tue Dec 17 00:39:49 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.dev2023.g3a31cfc:
+ + Move decision_maker() call into setUpClass
+
+-------------------------------------------------------------------
+Wed Nov 27 00:47:31 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.dev2022.g23c9c09:
+ + This script is not useful on a stable branch
+ + Replace assertLessEqual - is not in py26 testtools
+
+-------------------------------------------------------------------
New:
----
0001-Make-test_show_host_detail-work-with-multi-host-inst.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-tempest.spec ++++++
--- /var/tmp/diff_new_pack.A5KBJ4/_old 2014-01-23 15:50:48.000000000 +0100
+++ /var/tmp/diff_new_pack.A5KBJ4/_new 2014-01-23 15:50:48.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openstack-tempest
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 B1 Systems GmbH, Vohburg, Germany.
#
# All modifications and additions to the file contributed by third parties
@@ -22,13 +22,14 @@
%define username openstack-%{component}
Name: openstack-%{component}
-Version: 2013.2.dev2019.gd14f32a
+Version: 2013.2.dev2027.g4dabfe3
Release: 0
Summary: OpenStack Integration Test Suite (Tempest)
License: Apache-2.0
Group: System/Management
Url: https://launchpad.net/tempest
Source0: tempest-stable-havana.tar.gz
+Patch0: 0001-Make-test_show_host_detail-work-with-multi-host-inst.patch
BuildRequires: crudini
BuildRequires: fdupes
BuildRequires: openstack-suse-macros
@@ -63,6 +64,9 @@
Summary: OpenStack Integration Test Suite (Tempest) - Test Package
Group: Development/Languages/Python
Requires: %{name} = %{version}
+%if 0%{?suse_version} < 1110
+Requires: python-openstack.nose_plugin
+%endif
%description test
This is a set of integration tests to be run against a live OpenStack cluster.
@@ -75,26 +79,27 @@
Requires: python >= 2.6.8
Requires: python-anyjson >= 0.3.3
Requires: python-boto >= 2.4.0
-Requires: python-cinderclient >= 1.0.4
+Requires: python-cinderclient >= 1.0.6
Requires: python-eventlet >= 0.13.0
Requires: python-fixtures >= 0.3.14
Requires: python-glanceclient >= 0.9.0
Requires: python-hacking >= 0.5.6
Requires: python-heatclient >= 0.2.3
Requires: python-httplib2
-Requires: python-iso8601 >= 0.1.4
+Requires: python-iso8601 >= 0.1.8
Requires: python-jsonschema >= 1.3.0
-Requires: python-keyring >= 1.6
-Requires: python-keystoneclient >= 0.3.0
+Requires: python-keyring >= 1.6.1
+Requires: python-keystoneclient >= 0.3.2
Requires: python-lxml >= 2.3
Requires: python-netaddr
-Requires: python-neutronclient >= 2.2.3
+Requires: python-neutronclient >= 2.3.0
Requires: python-nose
-Requires: python-novaclient >= 2.12.0
-Requires: python-oslo.config >= 1.1.0
+Requires: python-novaclient >= 2.15.0
+Requires: python-oslo.config >= 1.2.0
Requires: python-paramiko >= 1.8.0
Requires: python-pbr >= 0.5.21
Requires: python-python-subunit
+Requires: python-six >= 1.4.1
Requires: python-testrepository >= 0.0.17
Requires: python-testresources >= 0.2.4
Requires: python-testtools >= 0.9.32
@@ -103,7 +108,8 @@
This package contains the core Python module of OpenStack Tempest.
%prep
-%setup -q -n tempest-2013.2.dev2019.gd14f32a
+%setup -q -n tempest-2013.2.dev2027.g4dabfe3
+%patch0 -p1
%openstack_cleanup_prep
%build
@@ -113,20 +119,28 @@
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
install -d -m 755 %{buildroot}%{_localstatedir}/lib/tempest
-install -d -m 0755 %{buildroot}%{_sysconfdir}/tempest
-install -m 0644 etc/logging.conf.sample
%{buildroot}%{_sysconfdir}/tempest/logging.conf
-install -m 0644 etc/tempest.conf.sample
%{buildroot}%{_sysconfdir}/tempest/tempest.conf
+install -d -m 700 %{buildroot}%{_localstatedir}/lock/tempest
+install -d -m 755 %{buildroot}%{_sysconfdir}/tempest
+install -m 644 etc/logging.conf.sample
%{buildroot}%{_sysconfdir}/tempest/logging.conf
+install -m 644 etc/tempest.conf.sample
%{buildroot}%{_sysconfdir}/tempest/tempest.conf
install -d %{buildroot}%{_mandir}/man1
install -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1
%fdupes %{buildroot}%{python_sitelib}/%{component}
# configuration fixes
+crudini --set %{buildroot}/etc/tempest/tempest.conf DEFAULT lock_path
/var/lock/tempest
crudini --set %{buildroot}/etc/tempest/tempest.conf cli cli_dir /usr/bin
crudini --set %{buildroot}/etc/tempest/tempest.conf boto s3_materials_path ""
crudini --set %{buildroot}/etc/tempest/tempest.conf scenario img_dir ""
+crudini --set %{buildroot}/etc/tempest/tempest.conf compute
change_password_available false
+crudini --set %{buildroot}/etc/tempest/tempest.conf compute
use_block_migration_for_live_migration true
+crudini --set %{buildroot}/etc/tempest/tempest.conf service_available neutron
true
+crudini --set %{buildroot}/etc/tempest/tempest.conf service_available swift
false
+crudini --set %{buildroot}/etc/tempest/tempest.conf service_available heat
false
### test subpackage
%openstack_test_package_install
+install -m 0755 run_tests.sh
%openstack_test_package_buildroot_dir/run_tempest.sh
%pre
getent group %{groupname} >/dev/null || groupadd -r %{groupname}
@@ -137,6 +151,7 @@
%defattr(-,root,root)
%doc LICENSE
%dir %{_sysconfdir}/tempest
+%dir %attr(700,root,root) %{_localstatedir}/lock/tempest
%config(noreplace) %{_sysconfdir}/tempest/logging.conf
%config(noreplace) %{_sysconfdir}/tempest/tempest.conf
++++++ 0001-Make-test_show_host_detail-work-with-multi-host-inst.patch ++++++
>From 900ffe936effba959076df5ae353f844405097c9 Mon Sep 17 00:00:00 2001
From: "m.benchcha...@cloudbau.de" <m.benchcha...@cloudbau.de>
Date: Thu, 31 Oct 2013 20:31:15 +0100
Subject: [PATCH] Make test_show_host_detail work with multi host installation
Get the host detail only if the host is compute host
and run the tests for all the compute host not just
for the first one.
Change-Id: I1830e6071c09d1e751048d74bd828d0eeac282f8
Closes-Bug: #1230000
---
tempest/api/compute/admin/test_hosts.py | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/tempest/api/compute/admin/test_hosts.py
b/tempest/api/compute/admin/test_hosts.py
index bf09428..3c4516b 100644
--- a/tempest/api/compute/admin/test_hosts.py
+++ b/tempest/api/compute/admin/test_hosts.py
@@ -83,14 +83,22 @@ class HostsAdminTestJSON(base.BaseComputeAdminTest):
resp, resources = self.client.show_host_detail(hostname)
self.assertEqual(200, resp.status)
- self.assertTrue(len(resources) >= 1)
- host_resource = resources[0]['resource']
- self.assertIsNotNone(host_resource)
- self.assertIsNotNone(host_resource['cpu'])
- self.assertIsNotNone(host_resource['disk_gb'])
- self.assertIsNotNone(host_resource['memory_mb'])
- self.assertIsNotNone(host_resource['project'])
- self.assertEqual(hostname, host_resource['host'])
+
+ hosts = [host for host in hosts if host['service'] == 'compute']
+ self.assertTrue(len(hosts) >= 1)
+
+ for host in hosts:
+ hostname = host['host_name']
+ resp, resources = self.client.show_host_detail(hostname)
+ self.assertEqual(200, resp.status)
+ self.assertTrue(len(resources) >= 1)
+ host_resource = resources[0]['resource']
+ self.assertIsNotNone(host_resource)
+ self.assertIsNotNone(host_resource['cpu'])
+ self.assertIsNotNone(host_resource['disk_gb'])
+ self.assertIsNotNone(host_resource['memory_mb'])
+ self.assertIsNotNone(host_resource['project'])
+ self.assertEqual(hostname, host_resource['host'])
@attr(type='negative')
def test_show_host_detail_with_nonexist_hostname(self):
--
1.8.4.1
++++++ tempest-stable-havana.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tempest-2013.2.dev2019.gd14f32a/AUTHORS
new/tempest-2013.2.dev2027.g4dabfe3/AUTHORS
--- old/tempest-2013.2.dev2019.gd14f32a/AUTHORS 2013-11-17 22:15:27.000000000
+0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/AUTHORS 2013-12-18 15:50:10.000000000
+0100
@@ -52,6 +52,7 @@
James E. Blair <jebl...@hp.com>
Jaroslav Henner <jhen...@redhat.com>
Jay Pipes <jaypi...@gmail.com>
+Jeremy Stanley <fu...@yuggoth.org>
Jinhe Fang <hzfan...@corp.netease.com>
Joe Gordon <joe.gord...@gmail.com>
Joe Gordon <j...@cloudscaling.com>
@@ -98,6 +99,7 @@
Morgan Fainberg <m...@metacloud.com>
Nachi Ueno <na...@ntti3.com>
Nayna Patel <nayna.pa...@hp.com>
+OpenStack Jenkins <jenk...@openstack.org>
Pavel Sedlák <psed...@redhat.com>
Prem Karat <prem.ka...@linux.vnet.ibm.com>
Pádraig Brady <pbr...@redhat.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tempest-2013.2.dev2019.gd14f32a/ChangeLog
new/tempest-2013.2.dev2027.g4dabfe3/ChangeLog
--- old/tempest-2013.2.dev2019.gd14f32a/ChangeLog 2013-11-17
22:15:27.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/ChangeLog 2013-12-18
15:50:10.000000000 +0100
@@ -1,3 +1,103 @@
+commit 4dabfe3e58045fba8ac58384a1bd7a528b73e5f3
+Merge: 10f53d5 4d21f0b
+Author: Jenkins <jenk...@review.openstack.org>
+Date: Wed Dec 18 14:48:17 2013 +0000
+
+ Merge "Have tox install via setup.py develop" into stable/havana
+
+commit 10f53d55d676478bc72d814a610f0b157dfa7413
+Author: OpenStack Jenkins <jenk...@openstack.org>
+Date: Wed Dec 11 18:53:59 2013 +0000
+
+ Updated from global requirements
+
+ Change-Id: I4b81481201d859679585d1885fa478ecc5238042
+
+commit 19647158009fe4b13e635c2e6d45e971b4403083
+Author: Matthew Treinish <trein...@linux.vnet.ibm.com>
+Date: Sat Oct 19 12:49:35 2013 -0400
+
+ Update to latest pbr
+
+ This commit moves switches tempest from the d2to1 version of pbr and
+ move to the latest version of pbr. However, there is a bug with
+ build_spinx so it doesn't work with a doc version set so that section
+ is removed from the doc conf.py.
+
+ Change-Id: I4fe14eb2b2e81132f8fa99936a031176b38c437b
+ (cherry picked from commit 271139aa7f1fa5f8d9e663702bf275378456fa46)
+
+commit 4d21f0b3a2e019763ca093abf9e045834b975f85
+Author: Jeremy Stanley <fu...@yuggoth.org>
+Date: Sun Dec 15 00:58:01 2013 +0000
+
+ Have tox install via setup.py develop
+
+ tox 1.6 was released, which means that we can now take advantage of
+ the feature we added to it - which is using setup.py develop to
+ install the code into the virtualenv. The logic was taken from
+ run_tests.sh - so the performance issues around using tox vs. using
+ install_venv should now be gone.
+
+ Additionally, override the tox pip install command to avoid using
+ the "--pre" option which is the default in tox. "--pre" means
+ "Include pre-release and development versions." By default, pip will
+ only install stable versions of software, and that is the behavior
+ we want.
+
+ Change-Id: Ida5e440d1bdb9f8e9031277ea53a02d2ef171438
+ Co-Authored-By: Monty Taylor <mord...@inaugust.com>
+
+commit 3a31cfc0a59949b6c0eee39fd2f7fb5b24d0850b
+Author: Matthew Treinish <trein...@linux.vnet.ibm.com>
+Date: Mon Oct 28 21:34:47 2013 -0400
+
+ Move decision_maker() call into setUpClass
+
+ Previously the class level call of decision_maker() to detect certain
+ configuration details for the boto tests was mad in the class
+ definition. This has issues with unit testing because it requires a
+ functional config at import time for the file. This commit avoids this
+ restriction by moving this call into setUpClass for BotoTestCase which
+ won't try to execute decision_maker() at import.
+
+ This commit also pins sphinx to <1.2
+
+ 1.2 was just released and has a bug that causes builds to fail with
+ the error.
+
+ Change-Id: I8abf4ae109576499fed6b31ae644c1bac58e3350
+ (cherry picked from commit f054a9c5f103a0e30e66f69c8f7872097feb3af3)
+
+commit 23c9c0914e177d1616e44198bdb7215318f306aa
+Merge: 64532cc 132fb5a
+Author: Jenkins <jenk...@review.openstack.org>
+Date: Tue Nov 26 23:36:01 2013 +0000
+
+ Merge "Replace assertLessEqual - is not in py26 testtools" into
stable/havana
+
+commit 64532cc94be24b1cc701a739a1763a4fcbe2af9a
+Author: David Kranz <dkr...@redhat.com>
+Date: Tue Nov 26 10:39:33 2013 -0500
+
+ This script is not useful on a stable branch
+
+ This whitelist for havana will never be driven to zero. Running this
+ script on stable/havana makes it harder to use logstash to finish this
+ work on master.
+
+ Change-Id: I8b72f0006e32b8a91f71ecb2bf659df315cb3b46
+
+commit 132fb5afd7358cda8ea5caac3464aa593a235315
+Author: David Kranz <dkr...@redhat.com>
+Date: Fri Oct 25 14:55:20 2013 -0400
+
+ Replace assertLessEqual - is not in py26 testtools
+
+ Fixes bug 1233513.
+
+ Change-Id: I22ba767739aa79fd6fdf75167b2573a27625e6d1
+
commit d14f32af5e9c6bcb501c5f9a6ddb29dd348bc46c
Author: Joe Gordon <joe.gord...@gmail.com>
Date: Thu Nov 14 12:55:55 2013 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tempest-2013.2.dev2019.gd14f32a/PKG-INFO
new/tempest-2013.2.dev2027.g4dabfe3/PKG-INFO
--- old/tempest-2013.2.dev2019.gd14f32a/PKG-INFO 2013-11-17
22:15:28.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/PKG-INFO 2013-12-18
15:50:10.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tempest
-Version: 2013.2.dev2019.gd14f32a
+Version: 2013.2.dev2027.g4dabfe3
Summary: OpenStack Integration Testing
Home-page: http://www.openstack.org/
Author: OpenStack QA
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tempest-2013.2.dev2019.gd14f32a/doc/source/conf.py
new/tempest-2013.2.dev2027.g4dabfe3/doc/source/conf.py
--- old/tempest-2013.2.dev2019.gd14f32a/doc/source/conf.py 2013-11-17
22:13:57.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/doc/source/conf.py 2013-12-18
15:48:44.000000000 +0100
@@ -51,17 +51,6 @@
project = u'Tempest'
copyright = u'2013, OpenStack QA Team'
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-import pbr.version
-version_info = pbr.version.VersionInfo('tempest')
-version = version_info.version_string()
-# The full version, including alpha/beta/rc tags.
-release = version_info.release_string()
-
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#language = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tempest-2013.2.dev2019.gd14f32a/requirements.txt
new/tempest-2013.2.dev2027.g4dabfe3/requirements.txt
--- old/tempest-2013.2.dev2019.gd14f32a/requirements.txt 2013-11-17
22:13:57.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/requirements.txt 2013-12-18
15:48:49.000000000 +0100
@@ -5,20 +5,20 @@
jsonschema>=1.3.0,!=1.4.0
testtools>=0.9.32
lxml>=2.3
-boto>=2.4.0
+boto>=2.4.0,!=2.13.0
paramiko>=1.8.0
netaddr
python-glanceclient>=0.9.0
-python-keystoneclient>=0.3.0
-python-novaclient>=2.12.0
-python-neutronclient>=2.2.3,<3
-python-cinderclient>=1.0.4
+python-keystoneclient>=0.3.2
+python-novaclient>=2.15.0
+python-neutronclient>=2.3.0,<3
+python-cinderclient>=1.0.6
python-heatclient>=0.2.3
testresources>=0.2.4
-keyring>=1.6.1
+keyring>=1.6.1,<2.0
testrepository>=0.0.17
oslo.config>=1.2.0
eventlet>=0.13.0
six>=1.4.1
-iso8601>=0.1.4
+iso8601>=0.1.8
fixtures>=0.3.14
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tempest-2013.2.dev2019.gd14f32a/setup.cfg
new/tempest-2013.2.dev2027.g4dabfe3/setup.cfg
--- old/tempest-2013.2.dev2019.gd14f32a/setup.cfg 2013-11-17
22:15:28.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/setup.cfg 2013-12-18
15:50:10.000000000 +0100
@@ -17,21 +17,11 @@
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
-[global]
-setup-hooks =
- pbr.hooks.setup_hook
-
[build_sphinx]
all_files = 1
build-dir = doc/build
source-dir = doc/source
-[nosetests]
-verbosity = 2
-
-[pbr]
-autodoc_tree_index_modules = true
-
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tempest-2013.2.dev2019.gd14f32a/setup.py
new/tempest-2013.2.dev2027.g4dabfe3/setup.py
--- old/tempest-2013.2.dev2019.gd14f32a/setup.py 2013-11-17
22:13:57.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/setup.py 2013-12-18
15:48:44.000000000 +0100
@@ -14,8 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
setuptools.setup(
- setup_requires=['d2to1', 'pbr'],
- d2to1=True)
+ setup_requires=['pbr'],
+ pbr=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/tempest-2013.2.dev2019.gd14f32a/tempest/api/object_storage/test_account_services.py
new/tempest-2013.2.dev2027.g4dabfe3/tempest/api/object_storage/test_account_services.py
---
old/tempest-2013.2.dev2019.gd14f32a/tempest/api/object_storage/test_account_services.py
2013-11-17 22:13:57.000000000 +0100
+++
new/tempest-2013.2.dev2027.g4dabfe3/tempest/api/object_storage/test_account_services.py
2013-12-18 15:48:49.000000000 +0100
@@ -101,7 +101,7 @@
'limit': limit}
resp, container_list = \
self.account_client.list_account_containers(params=params)
- self.assertLessEqual(len(container_list), limit)
+ self.assertTrue(len(container_list) <= limit, str(container_list))
@attr(type='smoke')
def test_list_account_metadata(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/tempest-2013.2.dev2019.gd14f32a/tempest/thirdparty/boto/test.py
new/tempest-2013.2.dev2027.g4dabfe3/tempest/thirdparty/boto/test.py
--- old/tempest-2013.2.dev2019.gd14f32a/tempest/thirdparty/boto/test.py
2013-11-17 22:13:57.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/tempest/thirdparty/boto/test.py
2013-12-18 15:48:44.000000000 +0100
@@ -193,11 +193,10 @@
class BotoTestCase(tempest.test.BaseTestCase):
"""Recommended to use as base class for boto related test."""
- conclusion = decision_maker()
-
@classmethod
def setUpClass(cls):
super(BotoTestCase, cls).setUpClass()
+ cls.conclusion = decision_maker()
# The trash contains cleanup functions and paramaters in tuples
# (function, *args, **kwargs)
cls._resource_trash_bin = {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/tempest-2013.2.dev2019.gd14f32a/tempest.egg-info/PKG-INFO
new/tempest-2013.2.dev2027.g4dabfe3/tempest.egg-info/PKG-INFO
--- old/tempest-2013.2.dev2019.gd14f32a/tempest.egg-info/PKG-INFO
2013-11-17 22:15:27.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/tempest.egg-info/PKG-INFO
2013-12-18 15:50:10.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tempest
-Version: 2013.2.dev2019.gd14f32a
+Version: 2013.2.dev2027.g4dabfe3
Summary: OpenStack Integration Testing
Home-page: http://www.openstack.org/
Author: OpenStack QA
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/tempest-2013.2.dev2019.gd14f32a/tempest.egg-info/SOURCES.txt
new/tempest-2013.2.dev2027.g4dabfe3/tempest.egg-info/SOURCES.txt
--- old/tempest-2013.2.dev2019.gd14f32a/tempest.egg-info/SOURCES.txt
2013-11-17 22:15:28.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/tempest.egg-info/SOURCES.txt
2013-12-18 15:50:10.000000000 +0100
@@ -40,6 +40,7 @@
tempest.egg-info/PKG-INFO
tempest.egg-info/SOURCES.txt
tempest.egg-info/dependency_links.txt
+tempest.egg-info/not-zip-safe
tempest.egg-info/requires.txt
tempest.egg-info/top_level.txt
tempest/api/README.rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/tempest-2013.2.dev2019.gd14f32a/tempest.egg-info/not-zip-safe
new/tempest-2013.2.dev2027.g4dabfe3/tempest.egg-info/not-zip-safe
--- old/tempest-2013.2.dev2019.gd14f32a/tempest.egg-info/not-zip-safe
1970-01-01 01:00:00.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/tempest.egg-info/not-zip-safe
2013-12-18 15:50:05.000000000 +0100
@@ -0,0 +1 @@
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/tempest-2013.2.dev2019.gd14f32a/tempest.egg-info/requires.txt
new/tempest-2013.2.dev2027.g4dabfe3/tempest.egg-info/requires.txt
--- old/tempest-2013.2.dev2019.gd14f32a/tempest.egg-info/requires.txt
2013-11-17 22:15:27.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/tempest.egg-info/requires.txt
2013-12-18 15:50:10.000000000 +0100
@@ -5,20 +5,20 @@
jsonschema>=1.3.0,!=1.4.0
testtools>=0.9.32
lxml>=2.3
-boto>=2.4.0
+boto>=2.4.0,!=2.13.0
paramiko>=1.8.0
netaddr
python-glanceclient>=0.9.0
-python-keystoneclient>=0.3.0
-python-novaclient>=2.12.0
-python-neutronclient>=2.2.3,<3
-python-cinderclient>=1.0.4
+python-keystoneclient>=0.3.2
+python-novaclient>=2.15.0
+python-neutronclient>=2.3.0,<3
+python-cinderclient>=1.0.6
python-heatclient>=0.2.3
testresources>=0.2.4
-keyring>=1.6.1
+keyring>=1.6.1,<2.0
testrepository>=0.0.17
oslo.config>=1.2.0
eventlet>=0.13.0
six>=1.4.1
-iso8601>=0.1.4
+iso8601>=0.1.8
fixtures>=0.3.14
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/tempest-2013.2.dev2019.gd14f32a/test-requirements.txt
new/tempest-2013.2.dev2027.g4dabfe3/test-requirements.txt
--- old/tempest-2013.2.dev2019.gd14f32a/test-requirements.txt 2013-11-17
22:13:57.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/test-requirements.txt 2013-12-18
15:48:49.000000000 +0100
@@ -1,6 +1,6 @@
hacking>=0.5.6,<0.8
# needed for doc build
docutils==0.9.1
-sphinx>=1.1.2
+sphinx>=1.1.2,<1.2
python-subunit
oslo.sphinx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tempest-2013.2.dev2019.gd14f32a/tools/check_logs.py
new/tempest-2013.2.dev2027.g4dabfe3/tools/check_logs.py
--- old/tempest-2013.2.dev2019.gd14f32a/tools/check_logs.py 2013-11-17
22:13:50.000000000 +0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/tools/check_logs.py 2013-12-18
15:48:49.000000000 +0100
@@ -16,140 +16,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-import argparse
-import gzip
-import os
-import re
-import StringIO
import sys
-import urllib2
-import yaml
-
-
-def process_files(file_specs, url_specs, whitelists):
- regexp = re.compile(r"^.*(ERROR|CRITICAL).*\[.*\-.*\]")
- had_errors = False
- for (name, filename) in file_specs:
- whitelist = whitelists.get(name, [])
- with open(filename) as content:
- if scan_content(name, content, regexp, whitelist):
- had_errors = True
- for (name, url) in url_specs:
- whitelist = whitelists.get(name, [])
- req = urllib2.Request(url)
- req.add_header('Accept-Encoding', 'gzip')
- page = urllib2.urlopen(req)
- buf = StringIO.StringIO(page.read())
- f = gzip.GzipFile(fileobj=buf)
- if scan_content(name, f.read().splitlines(), regexp, whitelist):
- had_errors = True
- return had_errors
-
-
-def scan_content(name, content, regexp, whitelist):
- had_errors = False
- for line in content:
- if not line.startswith("Stderr:") and regexp.match(line):
- whitelisted = False
- for w in whitelist:
- pat = ".*%s.*%s.*" % (w['module'].replace('.', '\\.'),
- w['message'])
- if re.match(pat, line):
- whitelisted = True
- break
- if not whitelisted:
- if not had_errors:
- print("Log File: %s" % name)
- had_errors = True
- print(line)
- return had_errors
-
-
-def collect_url_logs(url):
- page = urllib2.urlopen(url)
- content = page.read()
- logs = re.findall('(screen-[\w-]+\.txt\.gz)</a>', content)
- return logs
-
-
-def main(opts):
- if opts.directory and opts.url or not (opts.directory or opts.url):
- print("Must provide exactly one of -d or -u")
- exit(1)
- print("Checking logs...")
- WHITELIST_FILE = os.path.join(
- os.path.abspath(os.path.dirname(os.path.dirname(__file__))),
- "etc", "whitelist.yaml")
-
- file_matcher = re.compile(r".*screen-([\w-]+)\.log")
- files = []
- if opts.directory:
- d = opts.directory
- for f in os.listdir(d):
- files.append(os.path.join(d, f))
- files_to_process = []
- for f in files:
- m = file_matcher.match(f)
- if m:
- files_to_process.append((m.group(1), f))
-
- url_matcher = re.compile(r".*screen-([\w-]+)\.txt\.gz")
- urls = []
- if opts.url:
- for logfile in collect_url_logs(opts.url):
- urls.append("%s/%s" % (opts.url, logfile))
- urls_to_process = []
- for u in urls:
- m = url_matcher.match(u)
- if m:
- urls_to_process.append((m.group(1), u))
-
- whitelists = {}
- with open(WHITELIST_FILE) as stream:
- loaded = yaml.safe_load(stream)
- if loaded:
- for (name, l) in loaded.iteritems():
- for w in l:
- assert 'module' in w, 'no module in %s' % name
- assert 'message' in w, 'no message in %s' % name
- whitelists = loaded
- if process_files(files_to_process, urls_to_process, whitelists):
- print("Logs have errors")
- # Return non-zero to start failing builds
- return 0
- else:
- print("ok")
- return 0
-
-usage = """
-Find non-white-listed log errors in log files from a devstack-gate run.
-Log files will be searched for ERROR or CRITICAL messages. If any
-error messages do not match any of the whitelist entries contained in
-etc/whitelist.yaml, those messages will be printed to the console and
-failure will be returned. A file directory containing logs or a url to the
-log files of an OpenStack gate job can be provided.
-
-The whitelist yaml looks like:
-
-log-name:
- - module: "a.b.c"
- message: "regexp"
- - module: "a.b.c"
- message: "regexp"
-
-repeated for each log file with a whitelist.
-"""
-
-parser = argparse.ArgumentParser(description=usage)
-parser.add_argument('-d', '--directory',
- help="Directory containing log files")
-parser.add_argument('-u', '--url',
- help="url containing logs from an OpenStack gate job")
if __name__ == "__main__":
- try:
- sys.exit(main(parser.parse_args()))
- except Exception as e:
- print("Failure in script: %s" % e)
- # Don't fail if there is a problem with the script.
- sys.exit(0)
+ # This script does nothing for stable/havana
+ sys.exit(0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tempest-2013.2.dev2019.gd14f32a/tox.ini
new/tempest-2013.2.dev2027.g4dabfe3/tox.ini
--- old/tempest-2013.2.dev2019.gd14f32a/tox.ini 2013-11-17 22:13:57.000000000
+0100
+++ new/tempest-2013.2.dev2027.g4dabfe3/tox.ini 2013-12-18 15:48:49.000000000
+0100
@@ -4,6 +4,7 @@
skipsdist = True
[testenv]
+install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
LANG=en_US.UTF-8
LANGUAGE=en_US:en
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
