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

Commit 74d048c

Browse files
partheaparthea
committed
add rest to tests
1 parent d352c2b commit 74d048c

File tree

1 file changed

+48
-32
lines changed

1 file changed

+48
-32
lines changed

‎tests/system/gapic/v1beta1/test_system_tables_client_v1.py‎

Lines changed: 48 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ def cancel_and_wait(self, op):
5959
assert op.cancelled()
6060

6161
@vpcsc_config.skip_if_inside_vpcsc
62-
def test_list_datasets(self):
63-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
62+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
63+
def test_list_datasets(self, transport):
64+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
6465
dataset = self.ensure_dataset_ready(client)
6566
# will raise if not found
6667
next(
@@ -70,14 +71,16 @@ def test_list_datasets(self):
7071
)
7172

7273
@vpcsc_config.skip_if_inside_vpcsc
73-
def test_list_models(self):
74-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
74+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
75+
def test_list_models(self, transport):
76+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
7577
model = self.ensure_model_ready(client)
7678
# will raise if not found
7779
next(iter([m for m in client.list_models(timeout=10) if m.name == model.name]))
7880

79-
def test_create_delete_dataset(self):
80-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
81+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
82+
def test_create_delete_dataset(self, transport):
83+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
8184
display_name = _id("t_cr_dl")
8285
dataset = client.create_dataset(display_name)
8386
assert dataset is not None
@@ -87,8 +90,9 @@ def test_create_delete_dataset(self):
8790
client.delete_dataset(dataset=dataset)
8891

8992
@vpcsc_config.skip_if_inside_vpcsc
90-
def test_import_data(self):
91-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
93+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
94+
def test_import_data(self, transport):
95+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
9296
display_name = _id("t_import")
9397
dataset = client.create_dataset(display_name)
9498
op = client.import_data(
@@ -99,8 +103,9 @@ def test_import_data(self):
99103
client.delete_dataset(dataset=dataset)
100104

101105
@vpcsc_config.skip_if_inside_vpcsc
102-
def test_import_pandas_dataframe(self):
103-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
106+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
107+
def test_import_pandas_dataframe(self, transport):
108+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
104109
display_name = _id("t_import_pandas")
105110
dataset = client.create_dataset(display_name)
106111
dataframe = pandas.DataFrame({"test-col1": [1, 2], "test-col2": [3, 4]})
@@ -128,8 +133,9 @@ def ensure_dataset_ready(self, client):
128133
return dataset
129134

130135
@vpcsc_config.skip_if_inside_vpcsc
131-
def test_list_column_specs(self):
132-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
136+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
137+
def test_list_column_specs(self, transport):
138+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
133139
dataset = self.ensure_dataset_ready(client)
134140
# will raise if not found
135141
next(
@@ -143,22 +149,25 @@ def test_list_column_specs(self):
143149
)
144150

145151
@vpcsc_config.skip_if_inside_vpcsc
146-
def test_get_column_spec(self):
147-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
152+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
153+
def test_get_column_spec(self, transport):
154+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
148155
dataset = self.ensure_dataset_ready(client)
149156
name = [d for d in client.list_column_specs(dataset=dataset)][0].name
150157
assert client.get_column_spec(name).name == name
151158

152159
@vpcsc_config.skip_if_inside_vpcsc
153-
def test_list_table_specs(self):
154-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
160+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
161+
def test_list_table_specs(self, transport):
162+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
155163
dataset = self.ensure_dataset_ready(client)
156164
name = [d for d in client.list_table_specs(dataset=dataset)][0].name
157165
assert client.get_table_spec(name).name == name
158166

159167
@vpcsc_config.skip_if_inside_vpcsc
160-
def test_set_column_nullable(self):
161-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
168+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
169+
def test_set_column_nullable(self, transport):
170+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
162171
dataset = self.ensure_dataset_ready(client)
163172
client.update_column_spec(
164173
dataset=dataset, column_spec_display_name="POutcome", nullable=True
@@ -167,8 +176,9 @@ def test_set_column_nullable(self):
167176
assert columns["POutcome"].data_type.nullable == True
168177

169178
@vpcsc_config.skip_if_inside_vpcsc
170-
def test_set_target_column(self):
171-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
179+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
180+
def test_set_target_column(self, transport):
181+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
172182
dataset = self.ensure_dataset_ready(client)
173183
client.set_target_column(dataset=dataset, column_spec_display_name="Age")
174184
columns = {c.display_name: c for c in client.list_column_specs(dataset=dataset)}
@@ -179,8 +189,9 @@ def test_set_target_column(self):
179189
)
180190

181191
@vpcsc_config.skip_if_inside_vpcsc
182-
def test_set_weight_column(self):
183-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
192+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
193+
def test_set_weight_column(self, transport):
194+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
184195
dataset = self.ensure_dataset_ready(client)
185196
client.set_weight_column(dataset=dataset, column_spec_display_name="Duration")
186197
columns = {c.display_name: c for c in client.list_column_specs(dataset=dataset)}
@@ -191,8 +202,9 @@ def test_set_weight_column(self):
191202
)
192203

193204
@vpcsc_config.skip_if_inside_vpcsc
194-
def test_set_weight_and_target_column(self):
195-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
205+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
206+
def test_set_weight_and_target_column(self, transport):
207+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
196208
dataset = self.ensure_dataset_ready(client)
197209
client.set_weight_column(dataset=dataset, column_spec_display_name="Day")
198210
client.set_target_column(dataset=dataset, column_spec_display_name="Campaign")
@@ -207,8 +219,9 @@ def test_set_weight_and_target_column(self):
207219
)
208220

209221
@vpcsc_config.skip_if_inside_vpcsc
210-
def test_create_delete_model(self):
211-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
222+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
223+
def test_create_delete_model(self, transport):
224+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
212225
dataset = self.ensure_dataset_ready(client)
213226
client.set_target_column(dataset=dataset, column_spec_display_name="Deposit")
214227
display_name = _id("t_cr_dl")
@@ -219,8 +232,9 @@ def test_create_delete_model(self):
219232
client.delete_model(model_display_name=display_name)
220233

221234
@vpcsc_config.skip_if_inside_vpcsc
222-
def test_list_model_evaluations(self):
223-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
235+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
236+
def test_list_model_evaluations(self, transport):
237+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
224238
model = self.ensure_model_online(client)
225239
# will raise if not found
226240
next(
@@ -234,15 +248,17 @@ def test_list_model_evaluations(self):
234248
)
235249

236250
@vpcsc_config.skip_if_inside_vpcsc
237-
def test_get_model_evaluation(self):
238-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
251+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
252+
def test_get_model_evaluation(self, transport):
253+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
239254
model = self.ensure_model_online(client)
240255
name = [m for m in client.list_model_evaluations(model=model)][0].name
241256
assert client.get_model_evaluation(model_evaluation_name=name).name == name
242257

243258
@vpcsc_config.skip_if_inside_vpcsc
244-
def test_online_predict(self):
245-
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION)
259+
@pytest.mark.parametrize("transport", ["grpc", "rest"])
260+
def test_online_predict(self, transport):
261+
client = automl_v1beta1.TablesClient(project=PROJECT, region=REGION, transport=transport)
246262
model = self.ensure_model_online(client)
247263
result = client.predict(
248264
inputs={

0 commit comments

Comments
 (0)