Merge into trunk : fix-pip-requires : Code : Glance

Status:

Merged

Approved by:

Jay Pipes on 2011-07-29

Approved revision:

170

Merged at revision:

169

Proposed branch:

lp:~johannes.erdfelt/glance/fix-pip-requires

Merge into:

lp:~hudson-openstack/glance/trunk

Diff against target:

21 lines (+1/-1)

2 files modified

Authors (+1/-0)
tools/pip-requires (+0/-1)

To merge this branch:

bzr merge lp:~johannes.erdfelt/glance/fix-pip-requires

Low

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Jay Pipes (community)	2011-07-29	Approve on 2011-07-29
Brian Waldon (community)		Approve on 2011-07-29
Josh Kearney (community)	2011-07-29	Approve on 2011-07-29
Review via email: mp+69821@code.launchpad.net

Description of the change

Remove unnecessary hashlib entry in pip-requires.

Glance currently requires at least Python 2.5 (and actually 2.6 because of inconsistent use of with_statement) which includes hashlib as part of the standard library.

Revision history for this message

Josh Kearney (jk0) on 2011-07-29:

#

review: Approve

Revision history for this message

Brian Waldon (bcwaldon) wrote on 2011-07-29:

#

Fine with me. I want to double-check with Jay on the supported python versions, though.

review: Approve

Revision history for this message

Jay Pipes (jaypipes) on 2011-07-29:

#

review: Approve

Revision history for this message

OpenStack Infra (hudson-openstack) wrote on 2011-07-29:

#

Download full text (15.8 KiB)

The attempt to merge lp:~johannes.erdfelt/glance/fix-pip-requires into lp:glance failed. Below is the output from the failed tests.

running test
running egg_info
creating glance.egg-info
writing glance.egg-info/PKG-INFO
writing top-level names to glance.egg-info/top_level.txt
writing dependency_links to glance.egg-info/dependency_links.txt
writing manifest file 'glance.egg-info/SOURCES.txt'
reading manifest file 'glance.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no files found matching 'ChangeLog'
writing manifest file 'glance.egg-info/SOURCES.txt'
running build_ext

We test the following: ... ok
We test the following: ... ok
Test for LP Bugs #736295, #767203 ... ok
We test conditions that produced LP Bug #768969, where an image ... ok
Set up three test images and ensure each query param filter works ... ok
We test the following sequential series of actions: ... ok
Ensure marker and limit query params work ... ok
Set up three test images and ensure each query param filter works ... ok
We test the process flow where a user registers an image ... ok
A test against the actual datastore backend for the registry ... ok
A test that errors coming from the POST API do not ... ok
We test that various calls to the images and root endpoints are ... ok
Upload initial image, then attempt to upload duplicate image ... ok
Set up four test images and ensure each query param filter works ... ok
We test the following sequential series of actions: ... ok
Ensure marker and limit query params work ... ok
Set up three test images and ensure each query param filter works ... ok
We test the process flow where a user registers an image ... ok
A test against the actual datastore backend for the registry ... ok
A test that errors coming from the POST API do not ... ok
We test that various calls to the images and root endpoints are ... ok
Test logging output proper when verbose and debug ... ok
Test logging output proper when verbose and debug ... ok
A test for LP bug #704854 -- Exception thrown by registry ... ok
test that images don't get deleted immediatly and that the scrubber ... ok
test that images get deleted immediately by default ... ok
Tests raises BadRequest for invalid store header ... ok
Tests to add a basic image in the file store ... ok
Tests creates a queued image for no body and no loc header ... ok
Tests creates a queued image for no body and no loc header ... ok
Test that the image contents are checksummed properly ... ok
test_bad_container_format (tests.unit.test_api.TestGlanceAPI) ... ok
test_bad_disk_format (tests.unit.test_api.TestGlanceAPI) ... ok
test_delete_image (tests.unit.test_api.TestGlanceAPI) ... ok
test_delete_non_exists_image (tests.unit.test_api.TestGlanceAPI) ... ok
Here, we try to delete an image that is in the queued state. ... ok
Test that the ETag header matches the x-image-meta-checksum ... ok
Tests that the /images/detail registry API returns a 400 ... ok
Tests that the /images registry API returns list of ... ok
Test that the image contents are checksummed properly ... ok
Test for HEAD /images/<ID> ... ok
test_show_image_basic (tests.unit.test_api.TestGlanceAPI) ... ok
test_show_non_exists_image (te...

The attempt to merge lp:~johannes.erdfelt/glance/fix-pip-requires into lp:glance failed. Below is the output from the failed tests.

running test
running egg_info
creating glance.egg-info
writing glance.egg-info/PKG-INFO
writing top-level names to glance.egg-info/top_level.txt
writing dependency_links to glance.egg-info/dependency_links.txt
writing manifest file 'glance.egg-info/SOURCES.txt'
reading manifest file 'glance.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no files found matching 'ChangeLog'
writing manifest file 'glance.egg-info/SOURCES.txt'
running build_ext

We test the following: ... ok
We test the following: ... ok
Test for LP Bugs #736295, #767203 ... ok
We test conditions that produced LP Bug #768969, where an image ... ok
Set up three test images and ensure each query param filter works ... ok
We test the following sequential series of actions: ... ok
Ensure marker and limit query params work ... ok
Set up three test images and ensure each query param filter works ... ok
We test the process flow where a user registers an image ... ok
A test against the actual datastore backend for the registry ... ok
A test that errors coming from the POST API do not ... ok
We test that various calls to the images and root endpoints are ... ok
Upload initial image, then attempt to upload duplicate image ... ok
Set up four test images and ensure each query param filter works ... ok
We test the following sequential series of actions: ... ok
Ensure marker and limit query params work ... ok
Set up three test images and ensure each query param filter works ... ok
We test the process flow where a user registers an image ... ok
A test against the actual datastore backend for the registry ... ok
A test that errors coming from the POST API do not ... ok
We test that various calls to the images and root endpoints are ... ok
Test logging output proper when verbose and debug ... ok
Test logging output proper when verbose and debug ... ok
A test for LP bug #704854 -- Exception thrown by registry ... ok
test that images don't get deleted immediatly and that the scrubber ... ok
test that images get deleted immediately by default ... ok
Tests raises BadRequest for invalid store header ... ok
Tests to add a basic image in the file store ... ok
Tests creates a queued image for no body and no loc header ... ok
Tests creates a queued image for no body and no loc header ... ok
Test that the image contents are checksummed properly ... ok
test_bad_container_format (tests.unit.test_api.TestGlanceAPI) ... ok
test_bad_disk_format (tests.unit.test_api.TestGlanceAPI) ... ok
test_delete_image (tests.unit.test_api.TestGlanceAPI) ... ok
test_delete_non_exists_image (tests.unit.test_api.TestGlanceAPI) ... ok
Here, we try to delete an image that is in the queued state. ... ok
Test that the ETag header matches the x-image-meta-checksum ... ok
Tests that the /images/detail registry API returns a 400 ... ok
Tests that the /images registry API returns list of ... ok
Test that the image contents are checksummed properly ... ok
Test for HEAD /images/<ID> ... ok
test_show_image_basic (tests.unit.test_api.TestGlanceAPI) ... ok
test_show_non_exists_image (tests.unit.test_api.TestGlanceAPI) ... ok
Tests that the /images POST registry API creates the image ... ok
Tests proper exception is raised if a bad disk_format is set ... ok
Tests proper exception is raised if a bad disk_format is set ... ok
Tests proper exception is raised if a bad status is set ... ok
Tests that exception raised for bad matching disk and ... ok
Tests that the /images DELETE registry API deletes the image ... ok
Tests proper exception is raised if attempt to delete ... ok
Tests that the /images/detail registry API returns ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns a 400 ... ok
Tests that the /images/details registry API returns list of ... ok
Tests that the /images/details registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Ensure a 400 is returned when a bad sort_dir is provided. ... ok
Ensure a 400 is returned when a bad sort_key is provided. ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns a 400 ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the root registry API returns "index", ... ok
Tests that the /images PUT registry API updates the image ... ok
Tests proper exception is raised if attempt to update ... ok
Tests that exception raised trying to set a bad container_format ... ok
Tests that exception raised trying to set a bad disk_format ... ok
Tests that exception raised trying to set a bad status ... ok
Tests that exception raised for bad matching disk and ... ok
Test ClientConnectionError raised ... ok
Tests proper exception is raised if image with ID already exists ... ok
Tests that we can add image metadata and returns the new id ... ok
Verify that ISO with invalid container format is rejected. ... ok
Tests a bad status is set to a proper one by server ... ok
Tests BadRequest raised when supplying bad store name in meta ... ok
Tests can add image by passing image data as file ... ok
Tests can add image by passing image data as string ... ok
Tests add image by passing image data as string w/ no size attr ... ok
Tests that we can add image metadata with ISO disk format ... ok
Tests that we can add image metadata with properties ... ok
Tests client returns image as queued ... ok
Tests that image metadata is deleted properly ... ok
Tests cannot delete non-existing image ... ok
Test a simple file backend retrieval works as expected ... ok
Tests that a detailed call can be filtered by a property ... ok
Tests that the detailed info about public images returned ... ok
Tests that a detailed call can be filtered by a base attribute ... ok
Tests that a detailed call can be filtered by a property ... ok
Test exception is raised when marker is invalid ... ok
Test detailed calls are filtered by marker/limit params. ... ok
Test correct set of public image returned ... ok
Tests that an index call can be filtered by a base attribute ... ok
Tests that an index call can be filtered by a property ... ok
Test exception is raised when marker is invalid ... ok
Test correct number of public images returned with limit param. ... ok
Test correct set of public images returned with marker param. ... ok
Test correct set of images returned with marker/limit params. ... ok
Tests that the client returns list of public images ... ok
Tests that the detailed info about an ISO image is returned ... ok
Tests that the detailed info about an image returned ... ok
Tests that NotFound is raised when getting a non-existing image ... ok
Test retrieval of a non-existing image returns a 404 ... ok
Tests that the /images PUT registry API updates the image ... ok
Tests non existing image update doesn't work ... ok
Tests proper exception is raised if image with ID already exists ... ok
Tests that we can add image metadata and returns the new id ... ok
Tests proper exception is raised if a bad status is set ... ok
Tests that we can add image metadata with properties ... ok
Tests that image metadata is deleted properly ... ok
Tests cannot delete non-existing image ... ok
Tests that the detailed info about an image returned ... ok
Tests that the detailed info about public images returned ... ok
Tests that a detailed call can be filtered by container_format ... ok
Tests that a detailed call can be filtered by disk_format ... ok
Tests that a detailed call can be filtered by name ... ok
Tests that a detailed call can be filtered by a property ... ok
Tests that a detailed call can be filtered by status ... ok
Test exception is raised when marker is invalid ... ok
Test correct set of images returned with marker/limit params. ... ok
Tests that a detailed call returns list of ... ok
Tests that a detailed call can be filtered by size_max ... ok
Tests that a detailed call can be filtered by size_min ... ok
Test correct set of public image returned ... ok
Test correct set of public, name-filtered image returned. This ... ok
Test exception is raised when marker is invalid ... ok
Test correct number of images returned with limit param. ... ok
Test correct set of images returned with limit param == None. ... ok
Test correct set of images returned with marker param. ... ok
Test correct set of images returned with marker/limit params. ... ok
Tests that NotFound is raised when getting a non-existing image ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images registry API returns list of ... ok
Tests that the /images PUT registry API updates the image ... ok
Tests non existing image update doesn't work ... ok
test_common_options (tests.unit.test_config.TestConfig) ... ok
test_parse_options (tests.unit.test_config.TestConfig) ... Usage: setup.py [options]

setup.py: error: no such option: --unknown
ok
Tests that an anonymous context (with is_admin set to False) ... ok
Tests that an anonymous context (with is_admin set to False) ... ok
Tests that an anonymous context (with is_admin set to False) ... ok
Tests that an anonymous context (with is_admin set to False) ... ok
Tests that an authenticated context (with is_admin set to ... ok
Tests that an authenticated context (with is_admin set to ... ok
Tests that an authenticated context (with is_admin set to ... ok
Tests that an authenticated context (with is_admin set to ... ok
Tests that an authenticated context (with is_admin set to ... ok
Tests that an authenticated context (with is_admin set to ... ok
Tests that an empty context (with is_admin set to True) can ... ok
Tests that an empty context (with is_admin set to True) can ... ok
Tests that an empty context (with is_admin set to True) can ... ok
Tests that an empty context (with is_admin set to True) can ... ok
Test that we can add an image via the filesystem backend ... ok
Tests that adding an image with an existing identifier ... ok
Test we can delete an existing image in the filesystem store ... ok
Test that trying to delete a file that doesn't exist ... ok
Test a "normal" retrieval of an image in chunks ... ok
Test that trying to retrieve a file that doesn't exist ... ok
Here, we test that in the case when we moved a column "type" from the ... ok
Walks all version scripts for each tested database, ensuring ... ok
test_authors_up_to_date (tests.unit.test_misc.AuthorsTestCase) ... FAIL
Test that a URI with a non-existing scheme triggers exception ... ok
Test the specific StoreLocation for the Filesystem store ... ok
Test that the backend returned by glance.store.get_backend_class ... ok
Test that for various URIs, the correct Location ... ok
Test the specific StoreLocation for the HTTP store ... ok
Test the specific StoreLocation for the S3 store ... ok
Test the specific StoreLocation for the Swift store ... ok
test_http_get (tests.unit.test_stores.TestHTTPBackend) ... ok
test_https_get (tests.unit.test_stores.TestHTTPBackend) ... ok
test_get (tests.unit.test_stores.TestS3Backend) ... ok
Test that we can add an image via the swift backend ... ok
Tests that adding an image with an existing identifier ... ok
Test that we can add an image via the swift backend with ... ok
Tests that adding options without auth address raises ... ok
Tests that adding an image with a non-existing container ... ok
Tests that adding an image with a non-existing container ... ok
Tests that adding options without user raises ... ok
Test we can delete an existing image in the swift store ... ok
Test that trying to delete a swift that doesn't exist ... ok
Test a "normal" retrieval of an image in chunks ... ok
Test retrieval of an image with wrong expected_size param ... ok
Test that trying to retrieve a swift that doesn't exist ... ok
Test a retrieval from Swift with an HTTP authurl. This is ... ok
Tests that adding options without key raises ... ok
Tests that boolean headers like is_public can be set ... ok
Verifies that data is the same after being passed through headers ... ok
Verifies that the headers returned by conversion code are unicode. ... ok
test_get_version_list (tests.unit.test_versions.VersionsTest) ... ok
test_default_no_body (tests.unit.test_wsgi.JSONRequestDeserializerTest) ... ok
test_default_with_body (tests.unit.test_wsgi.JSONRequestDeserializerTest) ... ok
test_from_json (tests.unit.test_wsgi.JSONRequestDeserializerTest) ... ok
test_has_body_has_content_length (tests.unit.test_wsgi.JSONRequestDeserializerTest) ... ok
test_has_body_no_content_length (tests.unit.test_wsgi.JSONRequestDeserializerTest) ... ok
test_has_body_zero_content_length (tests.unit.test_wsgi.JSONRequestDeserializerTest) ... ok
test_no_body_no_content_length (tests.unit.test_wsgi.JSONRequestDeserializerTest) ... ok
test_default (tests.unit.test_wsgi.JSONResponseSerializerTest) ... ok
test_to_json (tests.unit.test_wsgi.JSONResponseSerializerTest) ... ok
test_content_type_accept_default (tests.unit.test_wsgi.RequestTest) ... ok
test_content_type_from_accept_json (tests.unit.test_wsgi.RequestTest) ... ok
test_content_type_from_accept_json_xml_quality (tests.unit.test_wsgi.RequestTest) ... ok
test_content_type_from_accept_xml (tests.unit.test_wsgi.RequestTest) ... ok
test_content_type_from_accept_xml_json (tests.unit.test_wsgi.RequestTest) ... ok
test_content_type_missing (tests.unit.test_wsgi.RequestTest) ... ok
test_content_type_unsupported (tests.unit.test_wsgi.RequestTest) ... ok
test_content_type_with_charset (tests.unit.test_wsgi.RequestTest) ... ok
test_dispatch (tests.unit.test_wsgi.ResourceTest) ... ok
test_dispatch_default (tests.unit.test_wsgi.ResourceTest) ... ok
test_dispatch_no_default (tests.unit.test_wsgi.ResourceTest) ... ok
test_get_action_args (tests.unit.test_wsgi.ResourceTest) ... ok

======================================================================
FAIL: test_authors_up_to_date (tests.unit.test_misc.AuthorsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tmpiI5gzV/tests/unit/test_misc.py", line 75, in test_authors_up_to_date
    '%r not listed in Authors' % missing)
AssertionError: set([u'<johannes.erdfelt@rackspace.com>']) not listed in Authors

----------------------------------------------------------------------
Ran 236 tests in 68.662s

FAILED (failures=1)

Revision history for this message

Johannes Erdfelt (johannes.erdfelt) wrote on 2011-07-29:

#

Can't have an uncredited one line change now can we?

1	=== modified file 'Authors'
2	--- Authors 2011-07-23 00:07:38 +0000
3	+++ Authors 2011-07-29 16:03:33 +0000
4	@@ -10,6 +10,7 @@
5	Jason Koelker <jason@koelker.net>
6	Jay Pipes <jaypipes@gmail.com>
7	Jinwoo 'Joseph' Suh <jsuh@isi.edu>
8	+Johannes Erdfelt <johannes.erdfelt@rackspace.com>
9	Josh Kearney <josh@jk0.org>
10	Justin Shepherd <jshepher@rackspace.com>
11	Ken Pepple <ken.pepple@gmail.com>
12
13	=== modified file 'tools/pip-requires'
14	--- tools/pip-requires 2011-07-27 21:06:01 +0000
15	+++ tools/pip-requires 2011-07-29 16:03:33 +0000
16	@@ -17,5 +17,4 @@
17	sqlalchemy-migrate>=0.6,<0.7
18	bzr
19	httplib2
20	-hashlib
21	xattr

Glance

Merge lp:~johannes.erdfelt/glance/fix-pip-requires into lp:~hudson-openstack/glance/trunk

Commit message

Description of the change

Preview Diff

Subscribers