##// END OF EJS Templates
test-lfs: drop trailing ', ' item separators from debug JSON output...
Matt Harbison -
r37164:c37c47e4 default
parent child Browse files
Show More
@@ -249,7 +249,8 b' class _gitlfsremote(object):'
249 response['objects'] = sorted(response['objects'],
249 response['objects'] = sorted(response['objects'],
250 key=lambda p: p['oid'])
250 key=lambda p: p['oid'])
251 self.ui.debug('%s\n'
251 self.ui.debug('%s\n'
252 % json.dumps(response, indent=2, sort_keys=True))
252 % json.dumps(response, indent=2,
253 separators=('', ': '), sort_keys=True))
253
254
254 return response
255 return response
255
256
@@ -63,14 +63,14 b' store.'
63 {
63 {
64 "actions": {
64 "actions": {
65 "upload": {
65 "upload": {
66 "expires_at": "$ISO_8601_DATE_TIME$",
66 "expires_at": "$ISO_8601_DATE_TIME$"
67 "header": {
67 "header": {
68 "Accept": "application/vnd.git-lfs"
68 "Accept": "application/vnd.git-lfs"
69 },
69 }
70 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
70 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
71 }
71 }
72 },
72 }
73 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
73 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
74 "size": 12
74 "size": 12
75 }
75 }
76 ]
76 ]
@@ -133,14 +133,14 b' Clear the cache to force a download'
133 {
133 {
134 "actions": {
134 "actions": {
135 "download": {
135 "download": {
136 "expires_at": "$ISO_8601_DATE_TIME$",
136 "expires_at": "$ISO_8601_DATE_TIME$"
137 "header": {
137 "header": {
138 "Accept": "application/vnd.git-lfs"
138 "Accept": "application/vnd.git-lfs"
139 },
139 }
140 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
140 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
141 }
141 }
142 },
142 }
143 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
143 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
144 "size": 12
144 "size": 12
145 }
145 }
146 ]
146 ]
@@ -184,40 +184,40 b' When the server has some blobs already'
184 {
184 {
185 "actions": {
185 "actions": {
186 "download": {
186 "download": {
187 "expires_at": "$ISO_8601_DATE_TIME$",
187 "expires_at": "$ISO_8601_DATE_TIME$"
188 "header": {
188 "header": {
189 "Accept": "application/vnd.git-lfs"
189 "Accept": "application/vnd.git-lfs"
190 },
190 }
191 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
191 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
192 }
192 }
193 },
193 }
194 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
194 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
195 "size": 12
195 "size": 12
196 },
196 }
197 {
197 {
198 "actions": {
198 "actions": {
199 "upload": {
199 "upload": {
200 "expires_at": "$ISO_8601_DATE_TIME$",
200 "expires_at": "$ISO_8601_DATE_TIME$"
201 "header": {
201 "header": {
202 "Accept": "application/vnd.git-lfs"
202 "Accept": "application/vnd.git-lfs"
203 },
203 }
204 "href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
204 "href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
205 }
205 }
206 },
206 }
207 "oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19",
207 "oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
208 "size": 20
208 "size": 20
209 },
209 }
210 {
210 {
211 "actions": {
211 "actions": {
212 "upload": {
212 "upload": {
213 "expires_at": "$ISO_8601_DATE_TIME$",
213 "expires_at": "$ISO_8601_DATE_TIME$"
214 "header": {
214 "header": {
215 "Accept": "application/vnd.git-lfs"
215 "Accept": "application/vnd.git-lfs"
216 },
216 }
217 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
217 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
218 }
218 }
219 },
219 }
220 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
220 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
221 "size": 19
221 "size": 19
222 }
222 }
223 ]
223 ]
@@ -289,27 +289,27 b' Clear the cache to force a download'
289 {
289 {
290 "actions": {
290 "actions": {
291 "download": {
291 "download": {
292 "expires_at": "$ISO_8601_DATE_TIME$",
292 "expires_at": "$ISO_8601_DATE_TIME$"
293 "header": {
293 "header": {
294 "Accept": "application/vnd.git-lfs"
294 "Accept": "application/vnd.git-lfs"
295 },
295 }
296 "href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
296 "href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
297 }
297 }
298 },
298 }
299 "oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19",
299 "oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
300 "size": 20
300 "size": 20
301 },
301 }
302 {
302 {
303 "actions": {
303 "actions": {
304 "download": {
304 "download": {
305 "expires_at": "$ISO_8601_DATE_TIME$",
305 "expires_at": "$ISO_8601_DATE_TIME$"
306 "header": {
306 "header": {
307 "Accept": "application/vnd.git-lfs"
307 "Accept": "application/vnd.git-lfs"
308 },
308 }
309 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
309 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
310 }
310 }
311 },
311 }
312 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
312 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
313 "size": 19
313 "size": 19
314 }
314 }
315 ]
315 ]
@@ -362,14 +362,14 b' Test a corrupt file download, but clear '
362 {
362 {
363 "actions": {
363 "actions": {
364 "download": {
364 "download": {
365 "expires_at": "$ISO_8601_DATE_TIME$",
365 "expires_at": "$ISO_8601_DATE_TIME$"
366 "header": {
366 "header": {
367 "Accept": "application/vnd.git-lfs"
367 "Accept": "application/vnd.git-lfs"
368 },
368 }
369 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
369 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
370 }
370 }
371 },
371 }
372 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
372 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
373 "size": 19
373 "size": 19
374 }
374 }
375 ]
375 ]
@@ -416,14 +416,14 b' Test a corrupted file upload'
416 {
416 {
417 "actions": {
417 "actions": {
418 "upload": {
418 "upload": {
419 "expires_at": "$ISO_8601_DATE_TIME$",
419 "expires_at": "$ISO_8601_DATE_TIME$"
420 "header": {
420 "header": {
421 "Accept": "application/vnd.git-lfs"
421 "Accept": "application/vnd.git-lfs"
422 },
422 }
423 "href": "http://localhost:$HGPORT/objects/e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0"
423 "href": "http://localhost:$HGPORT/objects/e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0"
424 }
424 }
425 },
425 }
426 "oid": "e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0",
426 "oid": "e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0"
427 "size": 17
427 "size": 17
428 }
428 }
429 ]
429 ]
@@ -447,40 +447,40 b' Archive will prefetch blobs in a group'
447 {
447 {
448 "actions": {
448 "actions": {
449 "download": {
449 "download": {
450 "expires_at": "$ISO_8601_DATE_TIME$",
450 "expires_at": "$ISO_8601_DATE_TIME$"
451 "header": {
451 "header": {
452 "Accept": "application/vnd.git-lfs"
452 "Accept": "application/vnd.git-lfs"
453 },
453 }
454 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
454 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
455 }
455 }
456 },
456 }
457 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
457 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
458 "size": 12
458 "size": 12
459 },
459 }
460 {
460 {
461 "actions": {
461 "actions": {
462 "download": {
462 "download": {
463 "expires_at": "$ISO_8601_DATE_TIME$",
463 "expires_at": "$ISO_8601_DATE_TIME$"
464 "header": {
464 "header": {
465 "Accept": "application/vnd.git-lfs"
465 "Accept": "application/vnd.git-lfs"
466 },
466 }
467 "href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
467 "href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
468 }
468 }
469 },
469 }
470 "oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19",
470 "oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
471 "size": 20
471 "size": 20
472 },
472 }
473 {
473 {
474 "actions": {
474 "actions": {
475 "download": {
475 "download": {
476 "expires_at": "$ISO_8601_DATE_TIME$",
476 "expires_at": "$ISO_8601_DATE_TIME$"
477 "header": {
477 "header": {
478 "Accept": "application/vnd.git-lfs"
478 "Accept": "application/vnd.git-lfs"
479 },
479 }
480 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
480 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
481 }
481 }
482 },
482 }
483 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
483 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
484 "size": 19
484 "size": 19
485 }
485 }
486 ]
486 ]
@@ -533,27 +533,27 b' Cat will prefetch blobs in a group'
533 {
533 {
534 "actions": {
534 "actions": {
535 "download": {
535 "download": {
536 "expires_at": "$ISO_8601_DATE_TIME$",
536 "expires_at": "$ISO_8601_DATE_TIME$"
537 "header": {
537 "header": {
538 "Accept": "application/vnd.git-lfs"
538 "Accept": "application/vnd.git-lfs"
539 },
539 }
540 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
540 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
541 }
541 }
542 },
542 }
543 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
543 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
544 "size": 12
544 "size": 12
545 },
545 }
546 {
546 {
547 "actions": {
547 "actions": {
548 "download": {
548 "download": {
549 "expires_at": "$ISO_8601_DATE_TIME$",
549 "expires_at": "$ISO_8601_DATE_TIME$"
550 "header": {
550 "header": {
551 "Accept": "application/vnd.git-lfs"
551 "Accept": "application/vnd.git-lfs"
552 },
552 }
553 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
553 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
554 }
554 }
555 },
555 }
556 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
556 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
557 "size": 19
557 "size": 19
558 }
558 }
559 ]
559 ]
@@ -600,40 +600,40 b' Revert will prefetch blobs in a group'
600 {
600 {
601 "actions": {
601 "actions": {
602 "download": {
602 "download": {
603 "expires_at": "$ISO_8601_DATE_TIME$",
603 "expires_at": "$ISO_8601_DATE_TIME$"
604 "header": {
604 "header": {
605 "Accept": "application/vnd.git-lfs"
605 "Accept": "application/vnd.git-lfs"
606 },
606 }
607 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
607 "href": "http://localhost:$HGPORT/objects/31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
608 }
608 }
609 },
609 }
610 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b",
610 "oid": "31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b"
611 "size": 12
611 "size": 12
612 },
612 }
613 {
613 {
614 "actions": {
614 "actions": {
615 "download": {
615 "download": {
616 "expires_at": "$ISO_8601_DATE_TIME$",
616 "expires_at": "$ISO_8601_DATE_TIME$"
617 "header": {
617 "header": {
618 "Accept": "application/vnd.git-lfs"
618 "Accept": "application/vnd.git-lfs"
619 },
619 }
620 "href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
620 "href": "http://localhost:$HGPORT/objects/37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
621 }
621 }
622 },
622 }
623 "oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19",
623 "oid": "37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19"
624 "size": 20
624 "size": 20
625 },
625 }
626 {
626 {
627 "actions": {
627 "actions": {
628 "download": {
628 "download": {
629 "expires_at": "$ISO_8601_DATE_TIME$",
629 "expires_at": "$ISO_8601_DATE_TIME$"
630 "header": {
630 "header": {
631 "Accept": "application/vnd.git-lfs"
631 "Accept": "application/vnd.git-lfs"
632 },
632 }
633 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
633 "href": "http://localhost:$HGPORT/objects/d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
634 }
634 }
635 },
635 }
636 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998",
636 "oid": "d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998"
637 "size": 19
637 "size": 19
638 }
638 }
639 ]
639 ]
@@ -687,14 +687,14 b' Check error message when the remote miss'
687 {
687 {
688 "actions": {
688 "actions": {
689 "upload": {
689 "upload": {
690 "expires_at": "$ISO_8601_DATE_TIME$",
690 "expires_at": "$ISO_8601_DATE_TIME$"
691 "header": {
691 "header": {
692 "Accept": "application/vnd.git-lfs"
692 "Accept": "application/vnd.git-lfs"
693 },
693 }
694 "href": "http://localhost:$HGPORT/objects/8e6ea5f6c066b44a0efa43bcce86aea73f17e6e23f0663df0251e7524e140a13"
694 "href": "http://localhost:$HGPORT/objects/8e6ea5f6c066b44a0efa43bcce86aea73f17e6e23f0663df0251e7524e140a13"
695 }
695 }
696 },
696 }
697 "oid": "8e6ea5f6c066b44a0efa43bcce86aea73f17e6e23f0663df0251e7524e140a13",
697 "oid": "8e6ea5f6c066b44a0efa43bcce86aea73f17e6e23f0663df0251e7524e140a13"
698 "size": 6
698 "size": 6
699 }
699 }
700 ]
700 ]
@@ -754,14 +754,14 b' Check error message when object does not'
754 {
754 {
755 "actions": {
755 "actions": {
756 "upload": {
756 "upload": {
757 "expires_at": "$ISO_8601_DATE_TIME$",
757 "expires_at": "$ISO_8601_DATE_TIME$"
758 "header": {
758 "header": {
759 "Accept": "application/vnd.git-lfs"
759 "Accept": "application/vnd.git-lfs"
760 },
760 }
761 "href": "http://localhost:$HGPORT/objects/bdc26931acfb734b142a8d675f205becf27560dc461f501822de13274fe6fc8a"
761 "href": "http://localhost:$HGPORT/objects/bdc26931acfb734b142a8d675f205becf27560dc461f501822de13274fe6fc8a"
762 }
762 }
763 },
763 }
764 "oid": "bdc26931acfb734b142a8d675f205becf27560dc461f501822de13274fe6fc8a",
764 "oid": "bdc26931acfb734b142a8d675f205becf27560dc461f501822de13274fe6fc8a"
765 "size": 6
765 "size": 6
766 }
766 }
767 ]
767 ]
General Comments 0
You need to be logged in to leave comments. Login now