Skip to content

Commit d0b0fbb

Browse files
tarun-googletarun-google
committed
fix python flag
1 parent 3ad52e7 commit d0b0fbb

File tree

2 files changed

+19
-25
lines changed

2 files changed

+19
-25
lines changed

‎sdks/python/apache_beam/runners/dataflow/internal/apiclient.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ def _stage_resources(self, pipeline, options):
600600
if not type_payload.sha256:
601601
type_payload.sha256 = self._compute_sha256(type_payload.path)
602602

603-
if self._enable_caching and type_payload.sha256 and type_payload.sha256 in staged_hashes:
603+
if type_payload.sha256 and type_payload.sha256 in staged_hashes:
604604
_LOGGER.info(
605605
'Found duplicated artifact sha256: %s (%s)',
606606
type_payload.path,

‎sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,19 +1340,13 @@ def test_stage_resources(self):
13401340
])
13411341
}))
13421342
client = apiclient.DataflowApplicationClient(pipeline_options)
1343-
with mock.patch.object(apiclient.DataflowApplicationClient,
1344-
'_compute_sha256',
1345-
return_value='dummy_hash'):
1346-
with mock.patch.object(apiclient._LegacyDataflowStager,
1347-
'stage_job_resources') as mock_stager:
1348-
client._stage_resources(pipeline, pipeline_options)
1343+
with mock.patch.object(apiclient._LegacyDataflowStager,
1344+
'stage_job_resources') as mock_stager:
1345+
client._stage_resources(pipeline, pipeline_options)
13491346
mock_stager.assert_called_once_with(
1350-
[('/tmp/foo1', 'foo1', 'dummy_hash'),
1351-
('/tmp/bar1', 'bar1', 'dummy_hash'),
1352-
('/tmp/baz', 'baz1', 'dummy_hash'),
1353-
('/tmp/renamed1', 'renamed1', 'abcdefg'),
1354-
('/tmp/foo2', 'foo2', 'dummy_hash'),
1355-
('/tmp/bar2', 'bar2', 'dummy_hash')],
1347+
[('/tmp/foo1', 'foo1', ''), ('/tmp/bar1', 'bar1', ''),
1348+
('/tmp/baz', 'baz1', ''), ('/tmp/renamed1', 'renamed1', 'abcdefg'),
1349+
('/tmp/foo2', 'foo2', ''), ('/tmp/bar2', 'bar2', '')],
13561350
staging_location='gs://test-location/staging')
13571351

13581352
pipeline_expected = beam_runner_api_pb2.Pipeline(
@@ -1363,26 +1357,26 @@ def test_stage_resources(self):
13631357
beam_runner_api_pb2.ArtifactInformation(
13641358
type_urn=common_urns.artifact_types.URL.urn,
13651359
type_payload=beam_runner_api_pb2.ArtifactUrlPayload(
1366-
url='gs://test-location/staging/foo1',
1367-
sha256='dummy_hash').SerializeToString(),
1360+
url='gs://test-location/staging/foo1'
1361+
).SerializeToString(),
13681362
role_urn=common_urns.artifact_roles.STAGING_TO.urn,
13691363
role_payload=beam_runner_api_pb2.
13701364
ArtifactStagingToRolePayload(
13711365
staged_name='foo1').SerializeToString()),
13721366
beam_runner_api_pb2.ArtifactInformation(
13731367
type_urn=common_urns.artifact_types.URL.urn,
13741368
type_payload=beam_runner_api_pb2.ArtifactUrlPayload(
1375-
url='gs://test-location/staging/bar1',
1376-
sha256='dummy_hash').SerializeToString(),
1369+
url='gs://test-location/staging/bar1').
1370+
SerializeToString(),
13771371
role_urn=common_urns.artifact_roles.STAGING_TO.urn,
13781372
role_payload=beam_runner_api_pb2.
13791373
ArtifactStagingToRolePayload(
13801374
staged_name='bar1').SerializeToString()),
13811375
beam_runner_api_pb2.ArtifactInformation(
13821376
type_urn=common_urns.artifact_types.URL.urn,
13831377
type_payload=beam_runner_api_pb2.ArtifactUrlPayload(
1384-
url='gs://test-location/staging/baz1',
1385-
sha256='dummy_hash').SerializeToString(),
1378+
url='gs://test-location/staging/baz1').
1379+
SerializeToString(),
13861380
role_urn=common_urns.artifact_roles.STAGING_TO.urn,
13871381
role_payload=beam_runner_api_pb2.
13881382
ArtifactStagingToRolePayload(
@@ -1402,26 +1396,26 @@ def test_stage_resources(self):
14021396
beam_runner_api_pb2.ArtifactInformation(
14031397
type_urn=common_urns.artifact_types.URL.urn,
14041398
type_payload=beam_runner_api_pb2.ArtifactUrlPayload(
1405-
url='gs://test-location/staging/foo2',
1406-
sha256='dummy_hash').SerializeToString(),
1399+
url='gs://test-location/staging/foo2').
1400+
SerializeToString(),
14071401
role_urn=common_urns.artifact_roles.STAGING_TO.urn,
14081402
role_payload=beam_runner_api_pb2.
14091403
ArtifactStagingToRolePayload(
14101404
staged_name='foo2').SerializeToString()),
14111405
beam_runner_api_pb2.ArtifactInformation(
14121406
type_urn=common_urns.artifact_types.URL.urn,
14131407
type_payload=beam_runner_api_pb2.ArtifactUrlPayload(
1414-
url='gs://test-location/staging/bar2',
1415-
sha256='dummy_hash').SerializeToString(),
1408+
url='gs://test-location/staging/bar2').
1409+
SerializeToString(),
14161410
role_urn=common_urns.artifact_roles.STAGING_TO.urn,
14171411
role_payload=beam_runner_api_pb2.
14181412
ArtifactStagingToRolePayload(
14191413
staged_name='bar2').SerializeToString()),
14201414
beam_runner_api_pb2.ArtifactInformation(
14211415
type_urn=common_urns.artifact_types.URL.urn,
14221416
type_payload=beam_runner_api_pb2.ArtifactUrlPayload(
1423-
url='gs://test-location/staging/baz1',
1424-
sha256='dummy_hash').SerializeToString(),
1417+
url='gs://test-location/staging/baz1').
1418+
SerializeToString(),
14251419
role_urn=common_urns.artifact_roles.STAGING_TO.urn,
14261420
role_payload=beam_runner_api_pb2.
14271421
ArtifactStagingToRolePayload(

0 commit comments

Comments
 (0)