Skip to content

Commit 5ac2dbf

Browse files
tests: make lint happy
1 parent fafa55d commit 5ac2dbf

2 files changed

Lines changed: 30 additions & 29 deletions

File tree

tests/units/test_client.py

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,104 @@
1-
import pytest
21
from unittest.mock import Mock, patch
32

3+
import pytest
4+
45
from tfe import client, config
56

67

78
@pytest.fixture
89
def test_config():
9-
return config.Config(
10-
address="https://app.terraform.io",
11-
token="test-token"
12-
)
10+
return config.Config(address="https://app.terraform.io", token="test-token")
1311

1412

1513
@pytest.fixture
1614
def mock_response():
1715
response = Mock()
1816
response.headers = {
1917
"TFP-API-Version": "2.5.0",
20-
"X-TFE-Version": "v202308-1",
21-
"TFP-AppName": "HCP Terraform"
18+
"X-TFE-Version": "v202308-1",
19+
"TFP-AppName": "HCP Terraform",
2220
}
2321
response.raise_for_status.return_value = None
2422
return response
2523

2624

2725
class TestClient:
28-
@patch('requests.Session.get')
26+
@patch("requests.Session.get")
2927
def test_client_initialization(self, mock_get, test_config, mock_response):
3028
"""Test basic client setup works."""
3129
mock_get.return_value = mock_response
32-
30+
3331
client_instance = client.Client(config=test_config)
34-
32+
3533
assert client_instance.config.address == "https://app.terraform.io"
3634
assert client_instance.config.token == "test-token"
3735
assert client_instance.base_url == "https://app.terraform.io/api/v2/"
38-
assert client_instance.registry_base_url == "https://app.terraform.io/api/registry/"
36+
assert (
37+
client_instance.registry_base_url
38+
== "https://app.terraform.io/api/registry/"
39+
)
3940

40-
@patch('requests.Session.get')
41+
@patch("requests.Session.get")
4142
def test_url_normalization(self, mock_get, mock_response):
4243
"""Test that paths get normalized with trailing slashes."""
4344
mock_get.return_value = mock_response
44-
45+
4546
cfg = config.Config(
4647
address="https://example.com",
4748
token="test",
4849
base_path="/custom/api", # no trailing slash
49-
registry_base_path="/registry" # no trailing slash
50+
registry_base_path="/registry", # no trailing slash
5051
)
51-
52+
5253
client_instance = client.Client(config=cfg)
53-
54+
5455
assert client_instance.base_url == "https://example.com/custom/api/"
5556
assert client_instance.registry_base_url == "https://example.com/registry/"
5657

57-
@patch('requests.Session.get')
58+
@patch("requests.Session.get")
5859
def test_api_metadata_extraction(self, mock_get, test_config, mock_response):
5960
"""Test that API metadata gets extracted from response headers."""
6061
mock_get.return_value = mock_response
61-
62+
6263
client_instance = client.Client(config=test_config)
63-
64+
6465
assert client_instance.remote_api_version == "2.5.0"
6566
assert client_instance.remote_tfe_version == "v202308-1"
6667
assert client_instance.app_name == "HCP Terraform"
6768

68-
@patch('requests.Session.get')
69+
@patch("requests.Session.get")
6970
def test_cloud_vs_enterprise_detection(self, mock_get, test_config):
7071
"""Test detection between cloud and enterprise instances."""
7172
# Test HCP Terraform (cloud)
7273
cloud_response = Mock()
7374
cloud_response.headers = {"TFP-AppName": "HCP Terraform"}
7475
cloud_response.raise_for_status.return_value = None
7576
mock_get.return_value = cloud_response
76-
77+
7778
cloud_client = client.Client(config=test_config)
7879
assert cloud_client.is_cloud() is True
7980
assert cloud_client.is_enterprise() is False
80-
81+
8182
# Test Terraform Enterprise
8283
enterprise_response = Mock()
8384
enterprise_response.headers = {"TFP-AppName": "Terraform Enterprise"}
8485
enterprise_response.raise_for_status.return_value = None
8586
mock_get.return_value = enterprise_response
86-
87+
8788
enterprise_client = client.Client(config=test_config)
8889
assert enterprise_client.is_cloud() is False
8990
assert enterprise_client.is_enterprise() is True
9091

91-
@patch('requests.Session.get')
92+
@patch("requests.Session.get")
9293
def test_fake_api_version_for_testing(self, mock_get, test_config, mock_response):
9394
"""Test the fake API version setter for testing scenarios."""
9495
mock_get.return_value = mock_response
95-
96+
9697
client_instance = client.Client(config=test_config)
97-
98+
9899
# Original version from mock
99100
assert client_instance.remote_api_version == "2.5.0"
100-
101+
101102
# Set fake version
102103
client_instance.set_fake_remote_api_version("3.0.0")
103104
assert client_instance.remote_api_version == "3.0.0"

tests/units/test_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ def test_validate_config(self, monkeypatch):
8989
"""Test that configuration validation works as expected."""
9090
with pytest.raises(ValueError, match="API token is required") as _:
9191
monkeypatch.setenv("TFE_TOKEN", "")
92-
cfg = config.Config(token="")
92+
_ = config.Config(token="")
9393

9494
with pytest.raises(ValueError, match="Address must include protocol") as _:
9595
monkeypatch.setenv("TFE_TOKEN", "test-token")
9696
monkeypatch.setenv("TFE_ADDRESS", "test.foo.bar")
97-
cfg = config.Config()
97+
_ = config.Config()

0 commit comments

Comments
 (0)