From a2f9a7b48404ecb1eebc349feba25f9b59f5e531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 28 Feb 2019 12:34:23 +0100 Subject: [PATCH] =?UTF-8?q?Shaman=20changed=20response=20`does-not-exist`?= =?UTF-8?q?=20=E2=86=92=20`file-unknown`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of 'does-not-exist' we'll now receive 'file-unknown' (see Shaman commit 44efa6b39bddc703a14aa68316b092866813c38a) --- blender_asset_tracer/pack/shaman/transfer.py | 7 +++++-- tests/test_shaman_transfer.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/blender_asset_tracer/pack/shaman/transfer.py b/blender_asset_tracer/pack/shaman/transfer.py index 0395fe6..b7381f5 100644 --- a/blender_asset_tracer/pack/shaman/transfer.py +++ b/blender_asset_tracer/pack/shaman/transfer.py @@ -30,6 +30,9 @@ import blender_asset_tracer.pack.transfer as bat_transfer MAX_DEFERRED_PATHS = 8 MAX_FAILED_PATHS = 8 +response_file_unknown = "file-unknown" +response_already_uploading = "already-uploading" + class FileInfo: def __init__(self, checksum: str, filesize: int, abspath: pathlib.Path): @@ -204,9 +207,9 @@ class ShamanTransferrer(bat_transfer.FileTransferer): self.error_set(msg) return None - if response == 'does-not-exist': + if response == response_file_unknown: to_upload.appendleft(path) - elif response == 'already-uploading': + elif response == response_already_uploading: to_upload.append(path) elif response == 'ERROR': msg = 'Error from Shaman: %s' % path diff --git a/tests/test_shaman_transfer.py b/tests/test_shaman_transfer.py index cdced05..14bf1e8 100644 --- a/tests/test_shaman_transfer.py +++ b/tests/test_shaman_transfer.py @@ -65,7 +65,7 @@ class AbstractChecksumTest(AbstractBlendFileTest): self.assertEqual('text/plain', request.headers['Content-Type']) self.assertValidCheckoutDef(request.body) - body = 'does-not-exist path/in/pack/test1.blend\n' + body = 'file-unknown path/in/pack/test1.blend\n' return 200, {'Content-Type': 'text/plain'}, body def mock_checkout_create(request): @@ -87,5 +87,5 @@ class AbstractChecksumTest(AbstractBlendFileTest): trans.queue_copy(self.test_file2, pathlib.Path('/') / self.packed_names[self.test_file2]) trans.done_and_join() - self.assertFalse(trans.has_error) + self.assertFalse(trans.has_error, trans.error_message()) self.assertEqual('DA/-JOB-ID', trans.checkout_location)