Skip to content

Commit

Permalink
Fixing formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
mtlynch committed Mar 12, 2018
1 parent 6a4063c commit 2ddb8ba
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
3 changes: 1 addition & 2 deletions sia_load_tester/dataset_uploader.py
Expand Up @@ -11,8 +11,7 @@

def make_dataset_uploader(upload_queue, exit_event):
"""Factory for creating a DatasetUploader using production settings."""
return DatasetUploader(upload_queue,
sc.make_sia_client(),
return DatasetUploader(upload_queue, sc.make_sia_client(),
sia_conditions.make_waiter(exit_event), exit_event)


Expand Down
10 changes: 5 additions & 5 deletions tests/test_dataset.py
Expand Up @@ -15,12 +15,12 @@ def tearDown(self):
shutil.rmtree(self.test_dir)

def test_dataset_sorts_paths(self):
d = dataset.Dataset('/dummy-root', [
'c/foo.txt', 'a/100.jpg', 'a/105.jpg', 'a/102.jpg', 'b/bar.txt'
])
d = dataset.Dataset(
'/dummy-root',
['c/foo.txt', 'a/100.jpg', 'a/105.jpg', 'a/102.jpg', 'b/bar.txt'])
self.assertEqual(
['a/100.jpg', 'a/102.jpg', 'a/105.jpg', 'b/bar.txt',
'c/foo.txt'], d.paths)
['a/100.jpg', 'a/102.jpg', 'a/105.jpg', 'b/bar.txt', 'c/foo.txt'],
d.paths)

def test_load_from_path_empty_directory_makes_dataset_with_zero_paths(self):
d = dataset.load_from_path(self.test_dir)
Expand Down
12 changes: 6 additions & 6 deletions tests/test_dataset_uploader.py
Expand Up @@ -20,9 +20,9 @@ def setUp(self):
self.exit_event = threading.Event()

def test_uploads_nothing_when_all_files_are_on_sia(self):
dummy_dataset = dataset.Dataset('/dummy-path', [
'/dummy-path/a.txt', '/dummy-path/b.txt', '/dummy-path/c.txt'
])
dummy_dataset = dataset.Dataset(
'/dummy-path',
['/dummy-path/a.txt', '/dummy-path/b.txt', '/dummy-path/c.txt'])
self.mock_sia_api_impl.get_renter_files.return_value = {
u'files': [
{
Expand Down Expand Up @@ -74,9 +74,9 @@ def test_uploads_nothing_when_all_files_are_on_sia(self):
self.assertTrue(self.exit_event.is_set())

def test_uploads_file_when_one_is_missing_from_sia(self):
dummy_dataset = dataset.Dataset('/dummy-path', [
'/dummy-path/a.txt', '/dummy-path/b.txt', '/dummy-path/c.txt'
])
dummy_dataset = dataset.Dataset(
'/dummy-path',
['/dummy-path/a.txt', '/dummy-path/b.txt', '/dummy-path/c.txt'])
self.mock_sia_api_impl.get_renter_files.return_value = {
u'files': [
{
Expand Down

0 comments on commit 2ddb8ba

Please sign in to comment.