openstack/rally
Code Issues Proposed changes

[Sahara] Fix Job Binaries download

Browse Source 
The Job Binaries data should be treated as a binary content.

Change-Id: I8951a05be4276ad01efa531fddf6e560f1b2864d
This commit is contained in:
Nikita Konovalov 2015-03-04 19:38:30 +03:00
parent ce335c3e32
commit 30da63e606
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rally/benchmark/context/sahara/sahara_edp.py
View File

@ -145,7 +145,7 @@ class SaharaEDP(base.Context):
def download_and_save_lib(self, sahara, lib_type, name, download_url,
tenant_id):
lib_data = requests.get(download_url).json()
lib_data = requests.get(download_url).content
job_binary_internal = sahara.job_binary_internals.create(
name=name,

6
tests/unit/benchmark/context/sahara/test_sahara_edp.py
View File

@ -84,7 +84,7 @@ class SaharaEDPTestCase(test.TestCase):
mock_sahara.job_binary_internals.create.return_value = (
mock.MagicMock(id=42))
mock_requests.get().json.return_value = "test_binary"
mock_requests.get().content = "test_binary"
ctx = self.context_without_edp_keys
sahara_ctx = sahara_edp.SaharaEDP(ctx)
@ -99,7 +99,7 @@ class SaharaEDPTestCase(test.TestCase):
name="input_ds", description="",
data_source_type="hdfs",
url="hdfs://test_host/"))
download_calls.append(mock.call())
download_calls.append(mock.call("http://example.com/test.jar"))
job_binary_internals_calls.append(mock.call(
name="test.jar",
data="test_binary"))
@ -112,7 +112,7 @@ class SaharaEDPTestCase(test.TestCase):
sahara_ctx.setup()
mock_sahara.data_sources.create.assert_has_calls(input_ds_crete_calls)
mock_requests.get().json.assert_has_calls(download_calls)
mock_requests.get.assert_has_calls(download_calls)
mock_sahara.job_binary_internals.create.assert_has_calls(
job_binary_internals_calls)
mock_sahara.job_binaries.create.assert_has_calls(job_binaries_calls)