##// END OF EJS Templates
py3: add b'' and r'' prefixes to LFS tests
Matt Harbison -
r41468:2a1bb442 default
parent child Browse files
Show More
@@ -226,9 +226,9 though the client doesn't send the blob.
226 > # One time simulation of a read error
226 > # One time simulation of a read error
227 > if _readerr:
227 > if _readerr:
228 > _readerr = False
228 > _readerr = False
229 > raise IOError(errno.EIO, '%s: I/O error' % oid)
229 > raise IOError(errno.EIO, r'%s: I/O error' % oid.decode("utf-8"))
230 > # Simulate corrupt content on client download
230 > # Simulate corrupt content on client download
231 > blobstore._verify(oid, 'dummy content')
231 > blobstore._verify(oid, b'dummy content')
232 >
232 >
233 > def verify(self, oid):
233 > def verify(self, oid):
234 > '''Called in the server to populate the Batch API response,
234 > '''Called in the server to populate the Batch API response,
@@ -239,7 +239,7 though the client doesn't send the blob.
239 > global _numverifies
239 > global _numverifies
240 > _numverifies += 1
240 > _numverifies += 1
241 > if _numverifies <= 2:
241 > if _numverifies <= 2:
242 > raise IOError(errno.EIO, '%s: I/O error' % oid)
242 > raise IOError(errno.EIO, r'%s: I/O error' % oid.decode("utf-8"))
243 > return super(badstore, self).verify(oid)
243 > return super(badstore, self).verify(oid)
244 >
244 >
245 > store.__class__ = badstore
245 > store.__class__ = badstore
@@ -339,13 +339,13 Test a checksum failure during the proce
339 $LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.git/info/lfs/objects/batch': (glob)
339 $LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.git/info/lfs/objects/batch': (glob)
340 $LOCALIP - - [$ERRDATE$] HG error: Traceback (most recent call last): (glob)
340 $LOCALIP - - [$ERRDATE$] HG error: Traceback (most recent call last): (glob)
341 $LOCALIP - - [$ERRDATE$] HG error: verifies = store.verify(oid) (glob)
341 $LOCALIP - - [$ERRDATE$] HG error: verifies = store.verify(oid) (glob)
342 $LOCALIP - - [$ERRDATE$] HG error: raise IOError(errno.EIO, '%s: I/O error' % oid) (glob)
342 $LOCALIP - - [$ERRDATE$] HG error: raise IOError(errno.EIO, r'%s: I/O error' % oid.decode("utf-8")) (glob)
343 $LOCALIP - - [$ERRDATE$] HG error: IOError: [Errno 5] f03217a32529a28a42d03b1244fe09b6e0f9fd06d7b966d4d50567be2abe6c0e: I/O error (glob)
343 $LOCALIP - - [$ERRDATE$] HG error: IOError: [Errno 5] f03217a32529a28a42d03b1244fe09b6e0f9fd06d7b966d4d50567be2abe6c0e: I/O error (glob)
344 $LOCALIP - - [$ERRDATE$] HG error: (glob)
344 $LOCALIP - - [$ERRDATE$] HG error: (glob)
345 $LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.git/info/lfs/objects/batch': (glob)
345 $LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.git/info/lfs/objects/batch': (glob)
346 $LOCALIP - - [$ERRDATE$] HG error: Traceback (most recent call last): (glob)
346 $LOCALIP - - [$ERRDATE$] HG error: Traceback (most recent call last): (glob)
347 $LOCALIP - - [$ERRDATE$] HG error: verifies = store.verify(oid) (glob)
347 $LOCALIP - - [$ERRDATE$] HG error: verifies = store.verify(oid) (glob)
348 $LOCALIP - - [$ERRDATE$] HG error: raise IOError(errno.EIO, '%s: I/O error' % oid) (glob)
348 $LOCALIP - - [$ERRDATE$] HG error: raise IOError(errno.EIO, r'%s: I/O error' % oid.decode("utf-8")) (glob)
349 $LOCALIP - - [$ERRDATE$] HG error: IOError: [Errno 5] b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c: I/O error (glob)
349 $LOCALIP - - [$ERRDATE$] HG error: IOError: [Errno 5] b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c: I/O error (glob)
350 $LOCALIP - - [$ERRDATE$] HG error: (glob)
350 $LOCALIP - - [$ERRDATE$] HG error: (glob)
351 $LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.hg/lfs/objects/b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c': (glob)
351 $LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.hg/lfs/objects/b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c': (glob)
@@ -366,14 +366,14 Test a checksum failure during the proce
366 lambda perm:
366 lambda perm:
367 res.setbodybytes(localstore.read(oid))
367 res.setbodybytes(localstore.read(oid))
368 blob = self._read(self.vfs, oid, verify)
368 blob = self._read(self.vfs, oid, verify)
369 raise IOError(errno.EIO, '%s: I/O error' % oid)
369 raise IOError(errno.EIO, r'%s: I/O error' % oid.decode("utf-8"))
370 IOError: [Errno 5] 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d: I/O error
370 IOError: [Errno 5] 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d: I/O error
371
371
372 $LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.hg/lfs/objects/276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d': (glob)
372 $LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.hg/lfs/objects/276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d': (glob)
373 $LOCALIP - - [$ERRDATE$] HG error: Traceback (most recent call last): (glob)
373 $LOCALIP - - [$ERRDATE$] HG error: Traceback (most recent call last): (glob)
374 $LOCALIP - - [$ERRDATE$] HG error: res.setbodybytes(localstore.read(oid)) (glob)
374 $LOCALIP - - [$ERRDATE$] HG error: res.setbodybytes(localstore.read(oid)) (glob)
375 $LOCALIP - - [$ERRDATE$] HG error: blob = self._read(self.vfs, oid, verify) (glob)
375 $LOCALIP - - [$ERRDATE$] HG error: blob = self._read(self.vfs, oid, verify) (glob)
376 $LOCALIP - - [$ERRDATE$] HG error: blobstore._verify(oid, 'dummy content') (glob)
376 $LOCALIP - - [$ERRDATE$] HG error: blobstore._verify(oid, b'dummy content') (glob)
377 $LOCALIP - - [$ERRDATE$] HG error: hint=_('run hg verify')) (glob)
377 $LOCALIP - - [$ERRDATE$] HG error: hint=_('run hg verify')) (glob)
378 $LOCALIP - - [$ERRDATE$] HG error: LfsCorruptionError: detected corrupt lfs object: 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d (glob)
378 $LOCALIP - - [$ERRDATE$] HG error: LfsCorruptionError: detected corrupt lfs object: 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d (glob)
379 $LOCALIP - - [$ERRDATE$] HG error: (glob)
379 $LOCALIP - - [$ERRDATE$] HG error: (glob)
@@ -421,10 +421,10 lfs content, and the extension enabled.
421 ... runcommand(server, [b'config', b'extensions'])
421 ... runcommand(server, [b'config', b'extensions'])
422 ...
422 ...
423 ... print("\n# LFS disabled locally- revlogs don't have 0x2000 flag")
423 ... print("\n# LFS disabled locally- revlogs don't have 0x2000 flag")
424 ... runcommand(server, ['debugprocessors', 'nonlfs.txt', '-R',
424 ... runcommand(server, [b'debugprocessors', b'nonlfs.txt', b'-R',
425 ... '../nonlfs'])
425 ... b'../nonlfs'])
426 ... runcommand(server, ['config', 'extensions', '--cwd',
426 ... runcommand(server, [b'config', b'extensions', b'--cwd',
427 ... '../nonlfs'])
427 ... b'../nonlfs'])
428
428
429 # LFS enabled- both lfs and non-lfs revlogs have 0x2000 flag
429 # LFS enabled- both lfs and non-lfs revlogs have 0x2000 flag
430 *** runcommand debugprocessors lfs.bin -R ../server
430 *** runcommand debugprocessors lfs.bin -R ../server
General Comments 0
You need to be logged in to leave comments. Login now