Skip to content

Commit b6a1b6a

Browse files
Fix various integration test issues (#836)
1 parent c573961 commit b6a1b6a

File tree

5 files changed

+25
-6
lines changed

5 files changed

+25
-6
lines changed

tests/integration/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ def create_vpc_w_subnet():
215215
vpc_label,
216216
"--region",
217217
region,
218-
"--ipv6.range",
219-
"auto",
218+
# "--ipv6.range", TODO: Uncomment after VPC Dual Stack is ready to ship
219+
# "auto",
220220
"--subnets.ipv4",
221221
"10.0.0.0/24",
222222
"--subnets.label",

tests/integration/database/test_database_engine_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ def test_mysql_engine_config_view():
497497
binlog_retention = mysql_config[0]["binlog_retention_period"]
498498
assert binlog_retention["type"] == "integer"
499499
assert binlog_retention["minimum"] == 600
500-
assert binlog_retention["maximum"] == 604800
500+
assert binlog_retention["maximum"] == 9007199254740991
501501
assert binlog_retention["requires_restart"] is False
502502

503503
mysql_settings = mysql_config[0]["mysql"]

tests/integration/monitor/test_alerts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def test_list_alert_definitions_for_service_type(get_service_type):
104104
output = exec_test_command(
105105
BASE_CMDS["alerts"]
106106
+ [
107-
"service-definition-view",
107+
"service-definitions-list",
108108
service_type,
109109
"--text",
110110
"--delimiter=,",

tests/integration/vpc/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def test_vpc_wo_subnet():
3434
label,
3535
"--region",
3636
region,
37-
"--ipv6.range",
38-
"auto",
37+
# "--ipv6.range", TODO: Uncomment after VPC Dual Stack is ready to ship
38+
# "auto",
3939
"--no-headers",
4040
"--text",
4141
"--format=id",

tests/integration/vpc/test_vpc.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
BASE_CMD = ["linode-cli", "vpcs"]
1616

1717

18+
# TODO: Remove this variable and @pytest.mark.skipif once VPC Dual Stack is ready to ship
19+
disable_vpc_dual_stack_tests = True
20+
21+
1822
def test_list_vpcs(test_vpc_wo_subnet):
1923
vpc_id = test_vpc_wo_subnet
2024
res = exec_test_command(BASE_CMDS["vpcs"] + ["ls", "--text"])
@@ -224,6 +228,9 @@ def test_fails_to_update_vpc_subenet_w_invalid_label(test_vpc_w_subnet):
224228
assert "Label must include only ASCII" in res
225229

226230

231+
@pytest.mark.skipif(
232+
disable_vpc_dual_stack_tests, reason="Dual-stack tests disabled"
233+
)
227234
def test_create_vpc_with_ipv6_auto():
228235
region = get_random_region_with_caps(required_capabilities=["VPCs"])
229236
label = get_random_text(5) + "-vpc"
@@ -254,6 +261,9 @@ def test_create_vpc_with_ipv6_auto():
254261

255262

256263
@pytest.mark.parametrize("prefix_len", ["52"])
264+
@pytest.mark.skipif(
265+
disable_vpc_dual_stack_tests, reason="Dual-stack tests disabled"
266+
)
257267
def test_create_vpc_with_custom_ipv6_prefix_length(prefix_len):
258268
region = get_random_region_with_caps(required_capabilities=["VPCs"])
259269
label = get_random_text(5) + f"-vpc{prefix_len}"
@@ -281,6 +291,9 @@ def test_create_vpc_with_custom_ipv6_prefix_length(prefix_len):
281291
assert ipv6_range.endswith(f"/{prefix_len}")
282292

283293

294+
@pytest.mark.skipif(
295+
disable_vpc_dual_stack_tests, reason="Dual-stack tests disabled"
296+
)
284297
def test_create_subnet_with_ipv6_auto(test_vpc_wo_subnet):
285298
vpc_id = test_vpc_wo_subnet
286299
subnet_label = get_random_text(5) + "-ipv6subnet"
@@ -317,6 +330,9 @@ def test_create_subnet_with_ipv6_auto(test_vpc_wo_subnet):
317330
assert "/" in ipv6_range, f"Unexpected IPv6 CIDR format: {ipv6_range}"
318331

319332

333+
@pytest.mark.skipif(
334+
disable_vpc_dual_stack_tests, reason="Dual-stack tests disabled"
335+
)
320336
def test_fails_to_create_vpc_with_invalid_ipv6_range():
321337
region = get_random_region_with_caps(required_capabilities=["VPCs"])
322338
label = get_random_text(5) + "-invalidvpc"
@@ -352,6 +368,9 @@ def test_list_vpc_ip_address():
352368
assert header in lines[0]
353369

354370

371+
@pytest.mark.skipif(
372+
disable_vpc_dual_stack_tests, reason="Dual-stack tests disabled"
373+
)
355374
def test_list_vpc_ipv6s_address():
356375

357376
res = exec_test_command(

0 commit comments

Comments
 (0)