Skip to content

Commit 4fe8d25

Browse files
committed
fix spacings
1 parent b0f9bce commit 4fe8d25

File tree

8 files changed

+8
-11
lines changed

8 files changed

+8
-11
lines changed

tests/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ log_level=INFO
55
log_format = %(asctime)s %(levelname)s %(message)s
66
log_date_format = %Y-%m-%d %H:%M:%S
77
markers =
8-
bash
8+
bash

tests/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ pytest==8.3.5
22
docker==7.1.0
33
zabbix==1.3.1
44
python-dotenv==1.1.0
5-
psycopg2==2.9.10
5+
psycopg2==2.9.10

tests/service-scripts/mamonsu-pg/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ sudo -u postgres echo "restore_command = 'cp $WAL_DIR/%f %p'" >> $DATA_SLAVE_PHY
4848
su postgres -c "pg_ctl start -D $DATA_SLAVE_PHYSICAL_DIR"
4949

5050
# create logical slave
51-
if [ "$POSTGRES_VERSION" -ge 100 ]; then # TODO: пофиксить и объединить или убрать вообще
51+
if [ "$POSTGRES_VERSION" -ge 100 ]; then # TODO: Пофиксить, пока что отключено
5252
# create PGDATA directory
5353
sudo mkdir -p $DATA_SLAVE_LOGICAL_DIR
5454
sudo chown postgres:postgres $DATA_SLAVE_LOGICAL_DIR

tests/src/core/paths.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ class ProjectPaths:
1515

1616
COMPOSE_FILE = TESTS_ROOT / "docker-compose.yaml"
1717
METRICS_PATH = MAMONSU_ROOT / "github-actions-tests" / "sources"
18-

tests/src/utils/logger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ def warning(self, msg: str) -> None:
3737
self.logger.warning(msg)
3838

3939
def error(self, msg: Union[str, Exception]) -> None:
40-
self.logger.error(msg)
40+
self.logger.error(msg)

tests/tests/bash/test_zabbix_cli/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ def zabbix_options(mamonsu_container: 'DockerManager') -> str:
1414
zbx_user = mamonsu_env["ZABBIX_USER"]
1515
zbx_password = mamonsu_env["ZABBIX_PASSWD"]
1616

17-
return f"--url={zbx_web_url} --user={zbx_user} --password={zbx_password}"
17+
return f"--url={zbx_web_url} --user={zbx_user} --password={zbx_password}"

tests/tests/bash/test_zabbix_cli/test_template_dashboard.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def test_template_delete(
100100
zabbix_options: str,
101101
init_mamonsu_in_zbx,
102102
) -> None:
103-
mamonsu_container('mamonsu export template template.xml --template-name="test-template"') # TODO: вынести
103+
mamonsu_container('mamonsu export template template.xml --template-name="test-template"')
104104
mamonsu_container(f'mamonsu zabbix {zabbix_options} template export template.xml')
105105

106106
exit_code, template_id = mamonsu_container(

tests/tests/conftest.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ def parametrize(pg_version: int) -> int:
3939
return pg_version
4040

4141

42-
@pytest.fixture(scope="session", params=[10, 11,
43-
# 12, 13, 14, 15, 16, 17
44-
])
42+
@pytest.fixture(scope="session", params=[12, 13, 14, 15, 16, 17])
4543
def docker_compose(config: Config, request) -> None:
4644
subprocess.run(
4745
["docker", "rmi", f"{ContainersEnum.MAMONSU}:latest"]
@@ -57,7 +55,7 @@ def docker_compose(config: Config, request) -> None:
5755
"-d",
5856
"--wait",
5957
],
60-
# check=True,
58+
check=True,
6159
)
6260
yield # noqa
6361
subprocess.run(

0 commit comments

Comments
 (0)