Skip to content

Commit 816e218

Browse files
authored
test: fix autoflake syntax and depracated pytest warnings (#620)
1 parent c008c00 commit 816e218

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

tests/integration/networking/test_networking.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ def test_display_ips_for_available_linodes(test_linode_id):
5757
BASE_CMD + ["ips-list", "--text", "--no-headers", "--delimiter", ","]
5858
).stdout.decode()
5959

60-
assert re.search("^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}", result)
60+
assert re.search(r"^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}", result)
6161
assert re.search(
62-
"ipv4,True,[0-9]{1,3}\-[0-9]{1,3}\-[0-9]{1,3}\-[0-9]{1,3}\.ip.linodeusercontent.com,.*,[0-9][0-9][0-9][0-9][0-9][0-9][0-9]*",
62+
r"ipv4,True,[0-9]{1,3}\-[0-9]{1,3}\-[0-9]{1,3}\-[0-9]{1,3}\.ip.linodeusercontent.com,.*,[0-9][0-9][0-9][0-9][0-9][0-9][0-9]*",
6363
result,
6464
)
6565
assert re.search("ipv6,True,,.*,[0-9][0-9][0-9][0-9][0-9][0-9]*", result)
6666
assert re.search(
67-
"(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))",
67+
r"(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))",
6868
result,
6969
)
7070

@@ -97,7 +97,7 @@ def test_view_an_ip_address(test_linode_id):
9797
]
9898
).stdout.decode()
9999

100-
assert re.search("^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}", result)
100+
assert re.search(r"^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}", result)
101101

102102

103103
def test_allocate_additional_private_ipv4_address(test_linode_id):
@@ -120,7 +120,7 @@ def test_allocate_additional_private_ipv4_address(test_linode_id):
120120
]
121121
).stdout.decode()
122122

123-
assert re.search("^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}", result)
123+
assert re.search(r"^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}", result)
124124
assert re.search(
125125
"ipv4,False,.*,[0-9][0-9][0-9][0-9][0-9][0-9][0-9]*", result
126126
)

tests/integration/nodebalancers/test_node_balancers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def test_display_public_ipv4_for_nodebalancer(test_node_balancers):
212212
"--no-headers",
213213
]
214214
).stdout.decode()
215-
assert re.search("^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}", result)
215+
assert re.search(r"^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}", result)
216216

217217

218218
def test_fail_to_view_nodebalancer_with_invalid_id():

tests/integration/ssh/test_plugin_ssh.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
POLL_INTERVAL = 5
2525

2626

27-
@pytest.mark.skipif(platform == "win32", reason="Test N/A on Windows")
2827
@pytest.fixture
2928
def target_instance(ssh_key_pair_generator, linode_cloud_firewall):
3029
instance_label = f"cli-test-{get_random_text(length=6)}"

tests/integration/ssh/test_ssh.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
SSH_SLEEP_PERIOD = 50
1414

1515

16-
@pytest.mark.skipif(platform == "win32", reason="Test N/A on Windows")
1716
@pytest.fixture(scope="package")
1817
def linode_in_running_state(ssh_key_pair_generator, linode_cloud_firewall):
1918
pubkey_file, privkey_file = ssh_key_pair_generator
@@ -37,7 +36,7 @@ def linode_in_running_state(ssh_key_pair_generator, linode_cloud_firewall):
3736
.rstrip()
3837
)
3938

40-
alpine_image = re.findall("linode/alpine[^\s]+", res)[0]
39+
alpine_image = re.findall(r"linode/alpine[^\s]+", res)[0]
4140

4241
plan = (
4342
exec_test_command(
@@ -118,7 +117,7 @@ def test_ssh_to_linode_and_get_kernel_version(
118117
+ " -o StrictHostKeyChecking=no -o IdentitiesOnly=yes uname -r"
119118
).read()
120119

121-
assert re.search("[0-9]\.[0-9]*\.[0-9]*-.*-virt", output)
120+
assert re.search(r"[0-9]\.[0-9]*\.[0-9]*-.*-virt", output)
122121

123122

124123
@pytest.mark.skipif(platform == "win32", reason="Test N/A on Windows")

tests/integration/stackscripts/test_stackscripts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def get_linode_image_lists():
3333
.rstrip()
3434
)
3535

36-
images = re.findall("linode/[^\s]+", all_images)
36+
images = re.findall(r"linode/[^\s]+", all_images)
3737

3838
return images
3939

0 commit comments

Comments
 (0)