Skip to content

Commit fa323c1

Browse files
authored
tgc-revival: unskip tests (#15914)
1 parent d298e62 commit fa323c1

File tree

6 files changed

+33
-12
lines changed

6 files changed

+33
-12
lines changed

mmv1/products/compute/RegionHealthCheck.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ tgc_tests:
5858
- name: 'TestAccComputeRegionHealthCheck_typeTransition'
5959
skip: 'Test data has mismatched steps'
6060
- name: 'TestAccComputeRegionHealthCheck_grpcWithTls_create'
61-
skip: 'Test data has mismatched steps'
61+
skip: 'grpcTlsHealthCheck is not in CAI asset, but is required in this test.'
6262
- name: 'TestAccComputeRegionHealthCheck_grpcWithTls_update'
63-
skip: 'Test data has mismatched steps'
63+
skip: 'grpcTlsHealthCheck is not in CAI asset, but is required in this test.'
6464
sweeper:
6565
url_substitutions:
6666
- region: "us-central1"

mmv1/products/compute/Subnetwork.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ base_url: 'projects/{{project}}/regions/{{region}}/subnetworks'
4747
has_self_link: true
4848
include_in_tgc_next: true
4949
tgc_include_handwritten_tests: true
50-
tgc_tests:
51-
- name: 'TestAccComputeSubnetwork_secondaryIpRanges'
52-
skip: 'Test data has mismatched steps'
5350
immutable: true
5451
timeouts:
5552
insert_minutes: 20

mmv1/products/compute/UrlMap.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ async:
3838
collection_url_key: 'items'
3939
include_in_tgc_next: true
4040
tgc_include_handwritten_tests: true
41-
tgc_tests:
42-
- name: 'TestAccComputeUrlMap_trafficDirectorRemoveRouteRule'
43-
skip: 'Test data has mismatched steps'
44-
custom_code:
4541
examples:
4642
- name: 'url_map_bucket_and_service'
4743
primary_resource_id: 'urlmap'

mmv1/products/kms/CryptoKey.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ import_format:
4040
- '{{key_ring}}/cryptoKeys/{{name}}'
4141
include_in_tgc_next: true
4242
tgc_include_handwritten_tests: true
43-
tgc_tests:
44-
- name: 'TestAccKmsCryptoKey_rotation'
45-
skip: 'Test data has mismatched steps'
4643
timeouts:
4744
insert_minutes: 20
4845
update_minutes: 20

mmv1/third_party/terraform/services/compute/resource_compute_region_health_check_test.go

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,21 +186,51 @@ func TestAccComputeRegionHealthCheck_typeTransition(t *testing.T) {
186186
{
187187
Config: testAccComputeRegionHealthCheck_https(hckName),
188188
},
189+
{
190+
ResourceName: "google_compute_region_health_check.foobar",
191+
ImportState: true,
192+
ImportStateVerify: true,
193+
},
189194
{
190195
Config: testAccComputeRegionHealthCheck_http(hckName),
191196
},
197+
{
198+
ResourceName: "google_compute_region_health_check.foobar",
199+
ImportState: true,
200+
ImportStateVerify: true,
201+
},
192202
{
193203
Config: testAccComputeRegionHealthCheck_ssl(hckName),
194204
},
205+
{
206+
ResourceName: "google_compute_region_health_check.foobar",
207+
ImportState: true,
208+
ImportStateVerify: true,
209+
},
195210
{
196211
Config: testAccComputeRegionHealthCheck_tcp(hckName),
197212
},
213+
{
214+
ResourceName: "google_compute_region_health_check.foobar",
215+
ImportState: true,
216+
ImportStateVerify: true,
217+
},
198218
{
199219
Config: testAccComputeRegionHealthCheck_http2(hckName),
200220
},
221+
{
222+
ResourceName: "google_compute_region_health_check.foobar",
223+
ImportState: true,
224+
ImportStateVerify: true,
225+
},
201226
{
202227
Config: testAccComputeRegionHealthCheck_https(hckName),
203228
},
229+
{
230+
ResourceName: "google_compute_region_health_check.foobar",
231+
ImportState: true,
232+
ImportStateVerify: true,
233+
},
204234
},
205235
})
206236
}

mmv1/third_party/tgc_next/test/setup.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ type TgcMetadataPayload struct {
3939
RawConfig string `json:"raw_config"`
4040
ResourceMetadata map[string]*ResourceMetadata `json:"resource_metadata"`
4141
PrimaryResource string `json:"primary_resource"`
42+
CaiReadTime time.Time `json:"cai_read_time"`
4243
}
4344

4445
type ResourceTestData struct {

0 commit comments

Comments
 (0)