@ngocsangairvds/vsaf 3.1.26 → 3.2.1

package/tools/vds-scripts/bitbucket_orchestrator/tests/test_client_deployment_environments.py

@@ -0,0 +1,194 @@
+from __future__ import annotations
+
+from unittest.mock import Mock, patch
+
+import pytest
+from vds_bitbucket_orchestrator.client import BitbucketClient
+from vds_bitbucket_orchestrator.config import BitbucketSettings
+from vds_bitbucket_orchestrator.errors import BitbucketClientError
+
+
+class TestBitbucketClientDeploymentEnvironments:
+    """Tests for BitbucketClient deployment environment operations."""
+
+    @pytest.fixture
+    def cloud_settings(self) -> BitbucketSettings:
+        return BitbucketSettings(
+            BITBUCKET_TOKEN="token",
+            BITBUCKET_MODE="cloud",
+            BITBUCKET_CLOUD_WORKSPACE="workspace",
+        )
+
+    @pytest.fixture
+    def server_settings(self) -> BitbucketSettings:
+        return BitbucketSettings(
+            VDS_USERNAME="user",
+            VDS_PASSWORD="pass",
+            BITBUCKET_BASE_URL="https://example.com",
+            BITBUCKET_MODE="server",
+        )
+
+    def _mock_repository(self) -> Mock:
+        repository = Mock()
+        deployment_environments = Mock()
+        environment = Mock()
+        environment.data = {"uuid": "{env}", "name": "Prod", "category": "production"}
+        deployment_environments.each.return_value = [environment]
+        deployment_environments.get.return_value = environment
+        repository.deployment_environments = deployment_environments
+
+        env_variables = Mock()
+        variable = Mock()
+        variable.data = {"uuid": "{var}", "key": "API_URL", "secured": False}
+        env_variables.each.return_value = [variable]
+        env_variables.get.return_value = variable
+        env_variables.create.return_value = variable
+        environment.deployment_environment_variables = env_variables
+        return repository
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_list_deployment_environments_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        environments = client.list_deployment_environments("workspace", "repo")
+
+        mock_bitbucket.cloud.repositories.get.assert_called_once_with("workspace", "repo")
+        assert len(environments) == 1
+        assert environments[0]["name"] == "Prod"
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_get_deployment_environment_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        environment = client.get_deployment_environment("workspace", "repo", "{env}")
+
+        repository.deployment_environments.get.assert_called_once_with("{env}")
+        assert environment["uuid"] == "{env}"
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_list_deployment_environment_variables_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        variables = client.list_deployment_environment_variables("workspace", "repo", "{env}", pagelen=5)
+
+        repository.deployment_environments.get.assert_called_once_with("{env}")
+        environment = repository.deployment_environments.get.return_value
+        environment.deployment_environment_variables.each.assert_called_once_with(pagelen=5)
+        assert variables[0]["key"] == "API_URL"
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_create_deployment_environment_variable_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        result = client.create_deployment_environment_variable("workspace", "repo", "{env}", "API_URL", "https://")
+
+        repository.deployment_environments.get.assert_called_once_with("{env}")
+        env = repository.deployment_environments.get.return_value
+        env.deployment_environment_variables.create.assert_called_once_with("API_URL", "https://", False)
+        assert result["key"] == "API_URL"
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_update_deployment_environment_variable_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        result = client.update_deployment_environment_variable(
+            "workspace", "repo", "{env}", "{var}", value="rotate", secured=True
+        )
+
+        env = repository.deployment_environments.get.return_value
+        env.deployment_environment_variables.get.assert_called_once_with("{var}")
+        env.deployment_environment_variables.get.return_value.update.assert_called_once_with(
+            value="rotate", secured=True
+        )
+        assert result["key"] == "API_URL"
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_update_deployment_environment_variable_requires_fields(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        with pytest.raises(BitbucketClientError):
+            client.update_deployment_environment_variable("workspace", "repo", "{env}", "{var}")
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_delete_deployment_environment_variable_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        client.delete_deployment_environment_variable("workspace", "repo", "{env}", "{var}")
+
+        env = repository.deployment_environments.get.return_value
+        env.deployment_environment_variables.get.assert_called_once_with("{var}")
+        env.deployment_environment_variables.get.return_value.delete.assert_called_once_with()
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_deployment_environment_operations_require_cloud(
+        self, mock_bitbucket_class: Mock, server_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(server_settings)
+
+        with pytest.raises(BitbucketClientError):
+            client.list_deployment_environments("workspace", "repo")
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_deployment_environment_methods_handle_error(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        repository.deployment_environments.each.side_effect = Exception("API error")
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        with pytest.raises(BitbucketClientError):
+            client.list_deployment_environments("workspace", "repo")
+

package/tools/vds-scripts/bitbucket_orchestrator/tests/test_client_issues.py

@@ -0,0 +1,164 @@
+from __future__ import annotations
+
+from unittest.mock import Mock, patch
+
+import pytest
+from vds_bitbucket_orchestrator.client import BitbucketClient
+from vds_bitbucket_orchestrator.config import BitbucketSettings
+from vds_bitbucket_orchestrator.errors import BitbucketClientError
+
+
+class TestBitbucketClientIssues:
+    """Tests for BitbucketClient repository issue operations."""
+
+    @pytest.fixture
+    def cloud_settings(self) -> BitbucketSettings:
+        return BitbucketSettings(
+            BITBUCKET_TOKEN="token",
+            BITBUCKET_MODE="cloud",
+            BITBUCKET_CLOUD_WORKSPACE="workspace",
+        )
+
+    @pytest.fixture
+    def server_settings(self) -> BitbucketSettings:
+        return BitbucketSettings(
+            VDS_USERNAME="user",
+            VDS_PASSWORD="pass",
+            BITBUCKET_BASE_URL="https://example.com",
+            BITBUCKET_MODE="server",
+        )
+
+    def _mock_repository(self) -> Mock:
+        repository = Mock()
+        issues = Mock()
+        issue = Mock()
+        issue.data = {"id": 1, "title": "Bug", "state": "open"}
+        issues.each.return_value = [issue]
+        issues.create.return_value = issue
+        issues.get.return_value = issue
+        repository.issues = issues
+        return repository
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_list_repository_issues_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        issues = client.list_repository_issues("workspace", "repo", query='state = "open"', sort="-updated_on")
+
+        repository.issues.each.assert_called_once_with(q='state = "open"', sort="-updated_on")
+        assert issues[0]["title"] == "Bug"
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_create_repository_issue_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        issue = client.create_repository_issue("workspace", "repo", "Bug found", "Details", kind="bug", priority="critical")
+
+        repository.issues.create.assert_called_once_with("Bug found", "Details", "bug", "critical")
+        assert issue["id"] == 1
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_create_repository_issue_requires_title(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+
+        with pytest.raises(BitbucketClientError):
+            client.create_repository_issue("workspace", "repo", "")
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_get_repository_issue_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        issue = client.get_repository_issue("workspace", "repo", 1)
+
+        repository.issues.get.assert_called_once_with(1)
+        assert issue["id"] == 1
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_update_repository_issue_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        issue = client.update_repository_issue(
+            "workspace",
+            "repo",
+            1,
+            title="New Title",
+            kind="enhancement",
+            priority="minor",
+            state="resolved",
+            description="Updated details",
+        )
+
+        issue_obj = repository.issues.get.return_value
+        issue_obj.update.assert_called_once_with(
+            title="New Title",
+            kind="enhancement",
+            priority="minor",
+            state="resolved",
+            content={"raw": "Updated details"},
+        )
+        assert issue["id"] == 1
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_update_repository_issue_requires_fields(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+
+        with pytest.raises(BitbucketClientError):
+            client.update_repository_issue("workspace", "repo", 1)
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_delete_repository_issue_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        client.delete_repository_issue("workspace", "repo", 1)
+
+        repository.issues.get.assert_called_once_with(1)
+        repository.issues.get.return_value.delete.assert_called_once_with()
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_issue_operations_require_cloud(
+        self, mock_bitbucket_class: Mock, server_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(server_settings)
+
+        with pytest.raises(BitbucketClientError):
+            client.list_repository_issues("workspace", "repo")
+

package/tools/vds-scripts/bitbucket_orchestrator/tests/test_client_pipelines_advanced.py

@@ -0,0 +1,179 @@
+from __future__ import annotations
+
+from unittest.mock import Mock, patch
+
+import pytest
+from vds_bitbucket_orchestrator.client import BitbucketClient
+from vds_bitbucket_orchestrator.config import BitbucketSettings
+from vds_bitbucket_orchestrator.errors import BitbucketClientError
+
+
+class TestBitbucketClientPipelinesAdvanced:
+    """Tests for BitbucketClient advanced pipeline operations."""
+
+    @pytest.fixture
+    def cloud_settings(self) -> BitbucketSettings:
+        return BitbucketSettings(
+            BITBUCKET_TOKEN="token",
+            BITBUCKET_MODE="cloud",
+            BITBUCKET_CLOUD_WORKSPACE="workspace",
+        )
+
+    @pytest.fixture
+    def server_settings(self) -> BitbucketSettings:
+        return BitbucketSettings(
+            VDS_USERNAME="user",
+            VDS_PASSWORD="pass",
+            BITBUCKET_BASE_URL="https://example.com",
+            BITBUCKET_MODE="server",
+        )
+
+    def _mock_repository(self) -> Mock:
+        repository = Mock()
+        pipeline = Mock()
+        pipeline.data = {"uuid": "{pipeline}", "build_number": 42}
+        pipelines = Mock()
+        pipelines.get.return_value = pipeline
+        pipeline.steps.return_value = []
+        repository.pipelines = pipelines
+        return repository
+
+    def _mock_repository_with_step(self) -> Mock:
+        repository = Mock()
+        pipeline = Mock()
+        pipeline.data = {"uuid": "{pipeline}", "build_number": 42}
+
+        step = Mock()
+        step.data = {"uuid": "{step}", "state": "COMPLETED", "duration_in_seconds": 120}
+        pipeline.steps.return_value = [step]
+        pipeline.step.return_value = step
+        step.log.return_value = b"log output"
+
+        pipelines = Mock()
+        pipelines.get.return_value = pipeline
+        repository.pipelines = pipelines
+        return repository
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_get_pipeline_success(self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        pipeline = client.get_pipeline("workspace", "repo", "{pipeline}")
+
+        repository.pipelines.get.assert_called_once_with("{pipeline}")
+        assert pipeline["build_number"] == 42
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_list_pipeline_steps_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository_with_step()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        steps = client.list_pipeline_steps("workspace", "repo", "{pipeline}")
+
+        assert len(steps) == 1
+        assert steps[0]["state"] == "COMPLETED"
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_get_pipeline_step_success(self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository_with_step()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        step = client.get_pipeline_step("workspace", "repo", "{pipeline}", "{step}")
+
+        pipeline = repository.pipelines.get.return_value
+        pipeline.step.assert_called_once_with("{step}")
+        assert step["uuid"] == "{step}"
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_get_pipeline_step_log_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository_with_step()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        payload = client.get_pipeline_step_log("workspace", "repo", "{pipeline}", "{step}")
+
+        assert payload["content"] == "log output"
+        assert payload["size"] == len("log output")
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_get_pipeline_step_log_with_range(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository_with_step()
+        step = repository.pipelines.get.return_value.step.return_value
+        step.log.return_value = ("100", b"partial")
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        payload = client.get_pipeline_step_log("workspace", "repo", "{pipeline}", "{step}", start=0, end=50)
+
+        assert payload["size"] == 100
+        assert payload["content"] == "partial"
+        assert payload["range_start"] == 0
+        assert payload["range_end"] == 50
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_stop_pipeline_success(self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        pipeline = repository.pipelines.get.return_value
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        payload = client.stop_pipeline("workspace", "repo", "{pipeline}")
+
+        pipeline.stop.assert_called_once_with()
+        assert payload["status"] == "stopped"
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_pipeline_operations_require_cloud(
+        self, mock_bitbucket_class: Mock, server_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(server_settings)
+
+        with pytest.raises(BitbucketClientError):
+            client.get_pipeline("workspace", "repo", "{pipeline}")
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_pipeline_step_requires_fields(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository_with_step()
+        pipeline = repository.pipelines.get.return_value
+        pipeline.steps.return_value = []
+        pipeline.step.side_effect = Exception("API error")
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        with pytest.raises(BitbucketClientError):
+            client.get_pipeline_step("workspace", "repo", "{pipeline}", "{step}")
+
+

package/tools/vds-scripts/bitbucket_orchestrator/tests/test_client_pr_blockers.py

@@ -0,0 +1,119 @@
+from __future__ import annotations
+
+from unittest.mock import Mock, patch
+
+import pytest
+from vds_bitbucket_orchestrator.client import BitbucketClient
+from vds_bitbucket_orchestrator.config import BitbucketSettings
+from vds_bitbucket_orchestrator.errors import BitbucketClientError
+
+
+class TestBitbucketClientPullRequestBlockers:
+    """Tests for BitbucketClient pull request blocker operations."""
+
+    @pytest.fixture
+    def cloud_settings(self) -> BitbucketSettings:
+        return BitbucketSettings(
+            BITBUCKET_TOKEN="token",
+            BITBUCKET_MODE="cloud",
+            BITBUCKET_CLOUD_WORKSPACE="workspace",
+        )
+
+    @pytest.fixture
+    def server_settings(self) -> BitbucketSettings:
+        return BitbucketSettings(
+            VDS_USERNAME="user",
+            VDS_PASSWORD="pass",
+            BITBUCKET_BASE_URL="https://example.com",
+            BITBUCKET_MODE="server",
+        )
+
+    def _mock_repository(self) -> Mock:
+        repository = Mock()
+        pull_request = Mock()
+        pull_request.get.return_value = {"values": [{"uuid": "{blocker}", "message": "Fix tests"}]}
+        pull_request.post.return_value = {"uuid": "{blocker}", "message": "Fix tests"}
+        repository.pullrequests.get.return_value = pull_request
+        return repository
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_list_pull_request_blockers_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        blockers = client.list_pull_request_blockers("workspace", "repo", 1, query="state = \"OPEN\"")
+
+        repository.pullrequests.get.assert_called_once_with(1)
+        pull_request = repository.pullrequests.get.return_value
+        pull_request.get.assert_called_once_with("blockers", params={"q": "state = \"OPEN\""})
+        assert blockers[0]["message"] == "Fix tests"
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_add_pull_request_blocker_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        blocker = client.add_pull_request_blocker("workspace", "repo", 1, "Needs QA", reason="QA failure")
+
+        pull_request = repository.pullrequests.get.return_value
+        pull_request.post.assert_called_once_with(
+            "blockers",
+            {"message": "Needs QA", "reason": "QA failure"},
+        )
+        assert blocker["uuid"] == "{blocker}"
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_delete_pull_request_blocker_success(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+        mock_bitbucket = Mock()
+        mock_bitbucket.cloud = Mock()
+        repository = self._mock_repository()
+        mock_bitbucket.cloud.repositories.get.return_value = repository
+        client._client = mock_bitbucket
+
+        client.delete_pull_request_blocker("workspace", "repo", 1, "{blocker}")
+
+        pull_request = repository.pullrequests.get.return_value
+        pull_request.delete.assert_called_once_with("blockers/{blocker}")
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_add_pull_request_blocker_requires_message(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+
+        with pytest.raises(BitbucketClientError):
+            client.add_pull_request_blocker("workspace", "repo", 1, "")
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_delete_pull_request_blocker_requires_uuid(
+        self, mock_bitbucket_class: Mock, cloud_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(cloud_settings)
+
+        with pytest.raises(BitbucketClientError):
+            client.delete_pull_request_blocker("workspace", "repo", 1, "")
+
+    @patch("vds_bitbucket_orchestrator.client.AtlassianBitbucket")
+    def test_pull_request_blocker_operations_require_cloud(
+        self, mock_bitbucket_class: Mock, server_settings: BitbucketSettings
+    ) -> None:
+        client = BitbucketClient(server_settings)
+
+        with pytest.raises(BitbucketClientError):
+            client.list_pull_request_blockers("workspace", "repo", 1)
+