Merge lp:~swift/swift/swift_xml_subdir_changes into lp:~hudson-openstack/swift/trunk

[Conrad Weidenkeller]

Change subdir nodes in XML formatted object listings to align with object nodes. Now: <subdir name="foo"><name>foo</name></subdir> Before: <subdir name="foo" />

Change subdir nodes in XML to align with object nodes. Example:

Now

<subdir name="foo"><name>foo</name></subdir>

Before

<subdir name="foo" />

[gholt (gholt)]

This isn't really part of your change, but it has bothered me for a while so maybe you won't mind patching it. The attribute name should be saxutils.quoteattr encoded and the body of the name node should be as it is, saxutils.escape encoded.

[gholt (gholt)]

Might want to have Mike look at this too, since I think the attribute instead of body name was because he wanted to put items within the subdir element later. Kind of like how the container element has a name attribute and not a subelement of name.

[gholt (gholt)]

Assuming this goes through, an entry in CHANGELOG is needed.

[gholt (gholt)]

Mike verbally mumbled his approval but apparently doesn't want to go on record.

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~swift/swift/swift_xml_subdir_changes into lp:swift failed. Below is the output from the failed tests.

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

UNABLE TO READ FUNCTIONAL TESTS CONFIG FILE
UNABLE TO READ FUNCTIONAL TESTS CONFIG FILE
SKIPPING FUNCTIONAL TESTS DUE TO NO CONFIG
testAccountHead (test.functional.tests.TestAccount) ... SKIP
testContainerListing (test.functional.tests.TestAccount) ... SKIP
testContainerSerializedInfo (test.functional.tests.TestAccount) ... SKIP
testContainersOrderedByName (test.functional.tests.TestAccount) ... SKIP
testInvalidAuthToken (test.functional.tests.TestAccount) ... SKIP
testInvalidPath (test.functional.tests.TestAccount) ... SKIP
testInvalidUTF8Path (test.functional.tests.TestAccount) ... SKIP
testLastContainerMarker (test.functional.tests.TestAccount) ... SKIP
testListingLimit (test.functional.tests.TestAccount) ... SKIP
testMarkerLimitContainerList (test.functional.tests.TestAccount) ... SKIP
testNoAuthToken (test.functional.tests.TestAccount) ... SKIP
testPUT (test.functional.tests.TestAccount) ... SKIP
testVersionOnlyPath (test.functional.tests.TestAccount) ... SKIP
testGetRequest (test.functional.tests.TestAccountNoContainers) ... SKIP
testGetRequest (test.functional.tests.TestAccountNoContainersUTF8) ... SKIP
testAccountHead (test.functional.tests.TestAccountUTF8) ... SKIP
testContainerListing (test.functional.tests.TestAccountUTF8) ... SKIP
testContainerSerializedInfo (test.functional.tests.TestAccountUTF8) ... SKIP
testContainersOrderedByName (test.functional.tests.TestAccountUTF8) ... SKIP
testInvalidAuthToken (test.functional.tests.TestAccountUTF8) ... SKIP
testInvalidPath (test.functional.tests.TestAccountUTF8) ... SKIP
testInvalidUTF8Path (test.functional.tests.TestAccountUTF8) ... SKIP
testLastContainerMarker (test.functional.tests.TestAccountUTF8) ... SKIP
testListingLimit (test.functional.tests.TestAccountUTF8) ... SKIP
testMarkerLimitContainerList (test.functional.tests.TestAccountUTF8) ... SKIP
testNoAuthToken (test.functional.tests.TestAccountUTF8) ... SKIP
testPUT (test.functional.tests.TestAccountUTF8) ... SKIP
testVersionOnlyPath (test.functional.tests.TestAccountUTF8) ... SKIP
testContainerExistenceCachingProblem (test.functional.tests.TestContainer) ... SKIP
testContainerFileList (test.functional.tests.TestContainer) ... SKIP
testContainerFileListOnContainerThatDoesNotExist (test.functional.tests.TestContainer) ... SKIP
testContainerFileListWithLimit (test.functional.tests.TestContainer) ... SKIP
testContainerInfo (test.functional.tests.TestContainer) ... SKIP
testContainerInfoOnContainerThatDoesNotExist (test.functional.tests.TestContainer) ... SKIP
testContainerNameLimit (test.functional....

[gholt (gholt)]

Okay, this needs unit test updates.

Also, just for future reference, you should push to lp:~ohm/swift/<branchname> and not lp:~swift

review: Needs Fixing

[Conrad Weidenkeller (cweidenkeller)]

Functional and Unit tests pass now. Did you want me to push changes to my LP account or just keep this branch going till merge?

root@saio:~/swift/trunk# ./.unittests
..........................................SSSSSSSS................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 818 tests in 36.885s

OK (SKIP=8)

root@saio:~/swift/trunk# ./.functests
.............................................................................................................................................
----------------------------------------------------------------------
Ran 141 tests in 140.064s

OK
................
----------------------------------------------------------------------
Ran 16 tests in 8.328s

OK

=== modified file 'swift/container/server.py'
--- swift/container/server.py	2011-05-09 20:21:34 +0000
+++ swift/container/server.py	2011-05-19 10:46:41 +0000
@@ -316,7 +316,8 @@
                 created_at = datetime.utcfromtimestamp(
                     float(created_at)).isoformat()
                 if content_type is None:
-                    xml_output.append('<subdir name="%s" />' % name)
+                    xml_output.append('<subdir name="%s"><name>%s</name>'
+                                      '</subdir>' % (name, name))
                 else:
                     content_type = saxutils.escape(content_type)
                     xml_output.append('<object><name>%s</name><hash>%s</hash>'\

=== modified file 'test/unit/container/test_server.py'
--- test/unit/container/test_server.py	2011-01-25 01:12:38 +0000
+++ test/unit/container/test_server.py	2011-05-19 10:46:41 +0000
@@ -732,8 +732,9 @@
                 environ={'REQUEST_METHOD': 'GET'})
         resp = self.controller.GET(req)
         self.assertEquals(resp.body, '<?xml version="1.0" encoding="UTF-8"?>'
-            '\n<container name="c"><subdir name="US-OK-" />'
-            '<subdir name="US-TX-" /><subdir name="US-UT-" /></container>')
+            '\n<container name="c"><subdir name="US-OK-"><name>US-OK-</name></subdir>'
+            '<subdir name="US-TX-"><name>US-TX-</name></subdir>'
+            '<subdir name="US-UT-"><name>US-UT-</name></subdir></container>')
 
     def test_GET_path(self):
         req = Request.blank('/sda1/p/a/c', environ={'REQUEST_METHOD': 'PUT',