Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ def test_mysql_engine_config_view():
binlog_retention = mysql_config[0]["binlog_retention_period"]
assert binlog_retention["type"] == "integer"
assert binlog_retention["minimum"] == 600
assert binlog_retention["maximum"] == 86400
assert binlog_retention["maximum"] == 604800
assert binlog_retention["requires_restart"] is False

mysql_settings = mysql_config[0]["mysql"]
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/linodes/test_linodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def test_disk_view(test_linode_instance):

def test_create_linode_disk_encryption_enabled(linode_cloud_firewall):
test_region = get_random_region_with_caps(
required_capabilities=["Linodes", "LA Disk Encryption"]
required_capabilities=["Linodes", "Disk Encryption"]
)
linode_id = create_linode(
firewall_id=linode_cloud_firewall,
Expand Down Expand Up @@ -205,7 +205,7 @@ def test_create_linode_disk_encryption_enabled(linode_cloud_firewall):

def test_create_linode_disk_encryption_disabled(linode_cloud_firewall):
test_region = get_random_region_with_caps(
required_capabilities=["Linodes", "LA Disk Encryption"]
required_capabilities=["Linodes", "Disk Encryption"]
)

linode_id = create_linode(
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/nodebalancers/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def nodebalancer_with_default_conf(linode_cloud_firewall):
delete_target_id(target="nodebalancers", id=nodebalancer_id)


@pytest.fixture(scope="module")
@pytest.fixture(scope="function")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is necessary because a few of this fixture's consumers mutate it, breaking future assertions.

def nodebalancer_with_udp_config_and_node(linode_cloud_firewall):
nodebalancer_id = exec_test_command(
BASE_CMDS["nodebalancers"]
Expand Down
1 change: 1 addition & 0 deletions tests/integration/nodebalancers/test_node_balancers.py
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,7 @@ def test_list_nodes_for_node_balancer_udp_configuration(
"--no-headers",
]
)

assert (
result
== node_id
Expand Down
Loading