|
|
@ -73,7 +73,7 @@ class TestUploader(UploaderTestCase): |
|
|
|
|
|
|
|
|
|
|
|
self.start_thread() |
|
|
|
self.start_thread() |
|
|
|
# allow enough time that files could upload twice if there is a bug in the logic |
|
|
|
# allow enough time that files could upload twice if there is a bug in the logic |
|
|
|
time.sleep(2) |
|
|
|
time.sleep(1) |
|
|
|
self.join_thread() |
|
|
|
self.join_thread() |
|
|
|
|
|
|
|
|
|
|
|
exp_order = self.gen_order([self.seg_num], []) |
|
|
|
exp_order = self.gen_order([self.seg_num], []) |
|
|
@ -91,7 +91,7 @@ class TestUploader(UploaderTestCase): |
|
|
|
|
|
|
|
|
|
|
|
self.start_thread() |
|
|
|
self.start_thread() |
|
|
|
# allow enough time that files could upload twice if there is a bug in the logic |
|
|
|
# allow enough time that files could upload twice if there is a bug in the logic |
|
|
|
time.sleep(2) |
|
|
|
time.sleep(1) |
|
|
|
self.join_thread() |
|
|
|
self.join_thread() |
|
|
|
|
|
|
|
|
|
|
|
exp_order = self.gen_order([self.seg_num], []) |
|
|
|
exp_order = self.gen_order([self.seg_num], []) |
|
|
@ -110,7 +110,7 @@ class TestUploader(UploaderTestCase): |
|
|
|
|
|
|
|
|
|
|
|
self.start_thread() |
|
|
|
self.start_thread() |
|
|
|
# allow enough time that files could upload twice if there is a bug in the logic |
|
|
|
# allow enough time that files could upload twice if there is a bug in the logic |
|
|
|
time.sleep(2) |
|
|
|
time.sleep(1) |
|
|
|
self.join_thread() |
|
|
|
self.join_thread() |
|
|
|
|
|
|
|
|
|
|
|
exp_order = self.gen_order([self.seg_num], []) |
|
|
|
exp_order = self.gen_order([self.seg_num], []) |
|
|
@ -137,7 +137,7 @@ class TestUploader(UploaderTestCase): |
|
|
|
|
|
|
|
|
|
|
|
self.start_thread() |
|
|
|
self.start_thread() |
|
|
|
# allow enough time that files could upload twice if there is a bug in the logic |
|
|
|
# allow enough time that files could upload twice if there is a bug in the logic |
|
|
|
time.sleep(2) |
|
|
|
time.sleep(1) |
|
|
|
self.join_thread() |
|
|
|
self.join_thread() |
|
|
|
|
|
|
|
|
|
|
|
assert len(log_handler.upload_ignored) == 0, "Some files were ignored" |
|
|
|
assert len(log_handler.upload_ignored) == 0, "Some files were ignored" |
|
|
@ -155,7 +155,7 @@ class TestUploader(UploaderTestCase): |
|
|
|
f_paths = self.gen_files(lock=True, boot=False) |
|
|
|
f_paths = self.gen_files(lock=True, boot=False) |
|
|
|
|
|
|
|
|
|
|
|
# allow enough time that files should have been uploaded if they would be uploaded |
|
|
|
# allow enough time that files should have been uploaded if they would be uploaded |
|
|
|
time.sleep(2) |
|
|
|
time.sleep(1) |
|
|
|
self.join_thread() |
|
|
|
self.join_thread() |
|
|
|
|
|
|
|
|
|
|
|
for f_path in f_paths: |
|
|
|
for f_path in f_paths: |
|
|
@ -168,7 +168,7 @@ class TestUploader(UploaderTestCase): |
|
|
|
|
|
|
|
|
|
|
|
self.start_thread() |
|
|
|
self.start_thread() |
|
|
|
# allow enough time that files could upload twice if there is a bug in the logic |
|
|
|
# allow enough time that files could upload twice if there is a bug in the logic |
|
|
|
time.sleep(2) |
|
|
|
time.sleep(1) |
|
|
|
self.join_thread() |
|
|
|
self.join_thread() |
|
|
|
|
|
|
|
|
|
|
|
assert len(log_handler.upload_order) == 0, "File uploaded again" |
|
|
|
assert len(log_handler.upload_order) == 0, "File uploaded again" |
|
|
@ -176,7 +176,7 @@ class TestUploader(UploaderTestCase): |
|
|
|
def test_clear_locks_on_startup(self): |
|
|
|
def test_clear_locks_on_startup(self): |
|
|
|
f_paths = self.gen_files(lock=True, boot=False) |
|
|
|
f_paths = self.gen_files(lock=True, boot=False) |
|
|
|
self.start_thread() |
|
|
|
self.start_thread() |
|
|
|
time.sleep(1) |
|
|
|
time.sleep(0.25) |
|
|
|
self.join_thread() |
|
|
|
self.join_thread() |
|
|
|
|
|
|
|
|
|
|
|
for f_path in f_paths: |
|
|
|
for f_path in f_paths: |
|
|
|