Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
cognifloyd committed Nov 6, 2024
1 parent db08a63 commit 758afec
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
5 changes: 2 additions & 3 deletions pants-plugins/uses_services/st2cluster_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@

@dataclass(frozen=True)
class UsesSt2ClusterRequest:
"""One or more targets need a running st2 cluster with all st2* services.
"""
"""One or more targets need a running st2 cluster with all st2* services."""

auth_port: int = 9100
api_port: int = 9101
Expand Down Expand Up @@ -129,7 +128,7 @@ async def st2cluster_is_running(

# st2cluster is not running, so raise an error with instructions.
instructions = dedent(
f"""\
"""\
A full StackStorm cluster is required to run some integration tests.
To start the dev StackStorm cluster, run this from the repo root
(probably in a new terminal/window, as the output is quite verbose):
Expand Down
4 changes: 3 additions & 1 deletion pants-plugins/uses_services/st2cluster_rules_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ def test_st2cluster_is_running(rule_runner: RuleRunner) -> None:


@pytest.mark.parametrize("mock_platform", platform_samples)
def test_st2cluster_not_running(rule_runner: RuleRunner, mock_platform: Platform) -> None:
def test_st2cluster_not_running(
rule_runner: RuleRunner, mock_platform: Platform
) -> None:
request = UsesSt2ClusterRequest(
# some unassigned ports that are unlikely to be used
auth_port=10,
Expand Down
6 changes: 3 additions & 3 deletions scripts/github/prepare-integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ VIRTUALENV_DIR="${VIRTUALENV_DIR:-./virtualenv}"

# Activate the virtualenv created during make requirements phase
# shellcheck disable=SC1091
source ${VIRTUALENV_DIR}/bin/activate
source "${VIRTUALENV_DIR}/bin/activate"

# Enable coordination backend to avoid race conditions with orquesta tests due
# to the lack of the coordination backend
Expand All @@ -31,7 +31,7 @@ cat conf/st2.ci.conf || true
echo ""

# install st2 client
if [ ! -x ${VIRTUALENV_DIR}/bin/st2 ]; then
if [ ! -x "${VIRTUALENV_DIR}/bin/st2" ]; then
python ./st2client/setup.py develop
fi
st2 --version
Expand Down Expand Up @@ -67,7 +67,7 @@ chmod 777 logs/*

# root needs to access write some lock files when creating virtualenvs
# o=other; X=only set execute bit if user execute bit is set (eg on dirs)
chmod -R o+rwX ${VIRTUALENV_DIR}/
chmod -R o+rwX "${VIRTUALENV_DIR}/"
# newer virtualenv versions are putting lock files under ~/.local
# as this script runs with sudo, HOME is actually the CI user's home
chmod -R o+rwX "${HOME}/.local/share/virtualenv"

0 comments on commit 758afec

Please sign in to comment.