Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit 07d8531

Browse files
committed
Fix _validate_runner error msg for DataFlowRunner, no project/region case.
Change-Id: I85429442e715a7d9e68573eee9e181f16dbebc04
1 parent 9eff02a commit 07d8531

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

tfrutil/client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ def _validate_runner(
6666

6767
if (runner == 'DataFlowRunner') & (
6868
any(not v for v in [project, region])):
69-
raise AttributeError('DataFlowRunner requires project region and region '
70-
'project is {} and region is {}'.format(
71-
project, region))
69+
raise AttributeError(
70+
'DataFlowRunner requires valid `project` and `region` to be specified.'
71+
'The `project` is {} and `region` is {}'.format(project, region))
7272

7373
# def read_image_directory(dirpath) -> pd.DataFrame:
7474
# """Reads image data from a directory into a Pandas DataFrame."""

tfrutil/client_test.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,16 @@ def test_gcs_path_with_dataflow_runner_missing_param(self):
160160
"""Tests DataFlowRunner with missing required parameter."""
161161
df2 = self.test_df.copy()
162162
df2[constants.IMAGE_URI_KEY] = 'gs://' + df2[constants.IMAGE_URI_KEY]
163-
with self.assertRaises(AttributeError):
164-
client._validate_runner(
165-
df2,
166-
runner='DataFlowRunner',
167-
project=None,
168-
region=self.test_region)
163+
for p, r in [
164+
(None, self.test_region), (self.test_project, None), (None, None)]:
165+
with self.assertRaises(AttributeError) as context:
166+
client._validate_runner(
167+
df2,
168+
runner='DataFlowRunner',
169+
project=p,
170+
region=r)
171+
self.assertTrue('DataFlowRunner requires valid `project` and `region`'
172+
in repr(context.exception))
169173

170174

171175
def _make_csv_tempfile(data: List[List[str]]) -> tempfile.NamedTemporaryFile:

0 commit comments

Comments
 (0)