Skip to content
Snippets Groups Projects
Commit c37c47e4 authored by Matt Harbison's avatar Matt Harbison
Browse files

test-lfs: drop trailing ', ' item separators from debug JSON output

The trailing space looks weird when conditionalizing the line.  The commas
shouldn't be necessary because of the indenting.  The `lfs-test-server` isn't
sending all of the same items (notably, the "transfer" attribute is missing), so
having the commas means more lines need to be conditionalized.
parent 56c7cd06
No related branches found
No related tags found
No related merge requests found
......@@ -249,7 +249,8 @@
response['objects'] = sorted(response['objects'],
key=lambda p: p['oid'])
self.ui.debug('%s\n'
% json.dumps(response, indent=2, sort_keys=True))
% json.dumps(response, indent=2,
separators=('', ': '), sort_keys=True))
return response
......
......@@ -63,6 +63,6 @@
{
"actions": {
"upload": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -67,5 +67,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
......@@ -70,7 +70,7 @@
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
},
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
}
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
"size": 12
}
]
......@@ -133,6 +133,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -137,5 +137,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
......@@ -140,7 +140,7 @@
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
},
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
}
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
"size": 12
}
]
......@@ -184,6 +184,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -188,5 +188,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
......@@ -191,5 +191,5 @@
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
},
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
}
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
"size": 12
......@@ -195,5 +195,5 @@
"size": 12
},
}
{
"actions": {
"upload": {
......@@ -197,6 +197,6 @@
{
"actions": {
"upload": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -201,5 +201,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
}
......@@ -204,5 +204,5 @@
"href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
}
},
"oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19",
}
"oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
"size": 20
......@@ -208,5 +208,5 @@
"size": 20
},
}
{
"actions": {
"upload": {
......@@ -210,6 +210,6 @@
{
"actions": {
"upload": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -214,5 +214,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
......@@ -217,7 +217,7 @@
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
},
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
}
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
"size": 19
}
]
......@@ -289,6 +289,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -293,5 +293,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
}
......@@ -296,5 +296,5 @@
"href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
}
},
"oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19",
}
"oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
"size": 20
......@@ -300,5 +300,5 @@
"size": 20
},
}
{
"actions": {
"download": {
......@@ -302,6 +302,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -306,5 +306,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
......@@ -309,7 +309,7 @@
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
},
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
}
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
"size": 19
}
]
......@@ -362,6 +362,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -366,5 +366,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
......@@ -369,7 +369,7 @@
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
},
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
}
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
"size": 19
}
]
......@@ -416,6 +416,6 @@
{
"actions": {
"upload": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -420,5 +420,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0"
}
......@@ -423,7 +423,7 @@
"href": "http://localhost:$HGPORT/objects/e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0"
}
},
"oid": "e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0",
}
"oid": "e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0"
"size": 17
}
]
......@@ -447,6 +447,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -451,5 +451,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
......@@ -454,5 +454,5 @@
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
},
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
}
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
"size": 12
......@@ -458,5 +458,5 @@
"size": 12
},
}
{
"actions": {
"download": {
......@@ -460,6 +460,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -464,5 +464,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
}
......@@ -467,5 +467,5 @@
"href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
}
},
"oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19",
}
"oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
"size": 20
......@@ -471,5 +471,5 @@
"size": 20
},
}
{
"actions": {
"download": {
......@@ -473,6 +473,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -477,5 +477,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
......@@ -480,7 +480,7 @@
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
},
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
}
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
"size": 19
}
]
......@@ -533,6 +533,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -537,5 +537,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
......@@ -540,5 +540,5 @@
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
},
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
}
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
"size": 12
......@@ -544,5 +544,5 @@
"size": 12
},
}
{
"actions": {
"download": {
......@@ -546,6 +546,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -550,5 +550,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
......@@ -553,7 +553,7 @@
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
},
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
}
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
"size": 19
}
]
......@@ -600,6 +600,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -604,5 +604,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
......@@ -607,5 +607,5 @@
"href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
}
},
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
}
"oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
"size": 12
......@@ -611,5 +611,5 @@
"size": 12
},
}
{
"actions": {
"download": {
......@@ -613,6 +613,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -617,5 +617,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
}
......@@ -620,5 +620,5 @@
"href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
}
},
"oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19",
}
"oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
"size": 20
......@@ -624,5 +624,5 @@
"size": 20
},
}
{
"actions": {
"download": {
......@@ -626,6 +626,6 @@
{
"actions": {
"download": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -630,5 +630,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
......@@ -633,7 +633,7 @@
"href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
}
},
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
}
"oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
"size": 19
}
]
......@@ -687,6 +687,6 @@
{
"actions": {
"upload": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -691,5 +691,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/8e6ea5f6c066b44a0efa43bcce86aea73f17e6e23f0663df0251e7524e140a13"
}
......@@ -694,7 +694,7 @@
"href": "http://localhost:$HGPORT/objects/8e6ea5f6c066b44a0efa43bcce86aea73f17e6e23f0663df0251e7524e140a13"
}
},
"oid": "8e6ea5f6c066b44a0efa43bcce86aea73f17e6e23f0663df0251e7524e140a13",
}
"oid": "8e6ea5f6c066b44a0efa43bcce86aea73f17e6e23f0663df0251e7524e140a13"
"size": 6
}
]
......@@ -754,6 +754,6 @@
{
"actions": {
"upload": {
"expires_at": "$ISO_8601_DATE_TIME$",
"expires_at": "$ISO_8601_DATE_TIME$"
"header": {
"Accept": "application/vnd.git-lfs"
......@@ -758,5 +758,5 @@
"header": {
"Accept": "application/vnd.git-lfs"
},
}
"href": "http://localhost:$HGPORT/objects/bdc26931acfb734b142a8d675f205becf27560dc461f501822de13274fe6fc8a"
}
......@@ -761,7 +761,7 @@
"href": "http://localhost:$HGPORT/objects/bdc26931acfb734b142a8d675f205becf27560dc461f501822de13274fe6fc8a"
}
},
"oid": "bdc26931acfb734b142a8d675f205becf27560dc461f501822de13274fe6fc8a",
}
"oid": "bdc26931acfb734b142a8d675f205becf27560dc461f501822de13274fe6fc8a"
"size": 6
}
]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment