From d9a1c60982fb8f0004a9e7be9d3d468508a3f2c8 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 4 Apr 2022 12:14:56 +0200 Subject: [PATCH 1/4] fix nightly tests --- .../integration/resource_manager/test_engine.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/integration/resource_manager/test_engine.py b/tests/integration/resource_manager/test_engine.py index 04b9d3220a2..1dcf6187283 100644 --- a/tests/integration/resource_manager/test_engine.py +++ b/tests/integration/resource_manager/test_engine.py @@ -12,10 +12,14 @@ ) +def make_engine_name(database_name: str, suffix: str) -> str: + return f"{database_name}_{suffix}_{int(time.time())}" + + @pytest.mark.skip(reason="manual test") -def test_create_start_stop_engine(): +def test_create_start_stop_engine(database_name: str): rm = ResourceManager() - name = f"integration_test_{int(time.time())}" + name = make_engine_name(database_name, "create_start_stop_eng") engine = rm.engines.create(name=name) assert engine.name == name @@ -40,9 +44,9 @@ def test_create_start_stop_engine(): @pytest.mark.skip(reason="manual test") -def test_copy_engine(): +def test_copy_engine(database_name): rm = ResourceManager() - name = f"integration_test_{int(time.time())}" + name = make_engine_name(database_name, "copy_engine") engine = rm.engines.create(name=name) assert engine.name == name @@ -111,7 +115,7 @@ def get_engine_params(rm: ResourceManager, engine: Engine): def test_engine_update_single_parameter(rm_settings: Settings, database_name: str): rm = ResourceManager(rm_settings) - name = f"integration_test_{int(time.time())}" + name = make_engine_name(database_name, "engine_single_parameter") engine = rm.engines.create(name=name) engine.attach_to_database(database=rm.databases.get_by_name(database_name)) @@ -130,7 +134,7 @@ def test_engine_update_single_parameter(rm_settings: Settings, database_name: st def test_engine_update_multiple_parameters(rm_settings: Settings, database_name: str): rm = ResourceManager(rm_settings) - name = f"integration_test_{int(time.time())}" + name = make_engine_name(database_name, "engine_multi_parameter") engine = rm.engines.create(name=name) engine.attach_to_database(database=rm.databases.get_by_name(database_name)) From 93329a1d63f4b4e15b3a6268f315e2c6daeeed9d Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 4 Apr 2022 12:15:14 +0200 Subject: [PATCH 2/4] add security scans to nightly --- .github/workflows/nightly.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 96500c024ab..ff7fe8a08d2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -6,6 +6,14 @@ on: jobs: code-check: uses: ./.github/workflows/code-check.yml + unit-tests: + uses: ./.github/workflows/unit-tests.yml + security-scan: + needs: [unit-tests] + uses: ./.github/workflows/security-scan.yml + with: + FOSSA_TOKEN: ${{ secrets.FOSSA_TOKEN }} + SONARCLOUD_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} tests: runs-on: ${{ matrix.os }} strategy: From 53550271e2759272d2da13343e6a7232b4b8955d Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 4 Apr 2022 12:21:25 +0200 Subject: [PATCH 3/4] fix nightly yml --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ff7fe8a08d2..202a5d7d5ea 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -11,7 +11,7 @@ jobs: security-scan: needs: [unit-tests] uses: ./.github/workflows/security-scan.yml - with: + secrets: FOSSA_TOKEN: ${{ secrets.FOSSA_TOKEN }} SONARCLOUD_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} tests: From ea64fc9774aa88f05448c687495f7aa2b4c0dcb0 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Mon, 4 Apr 2022 16:23:26 +0200 Subject: [PATCH 4/4] make engine names shorter --- tests/integration/resource_manager/test_engine.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/integration/resource_manager/test_engine.py b/tests/integration/resource_manager/test_engine.py index 1dcf6187283..62ae8d8d6d9 100644 --- a/tests/integration/resource_manager/test_engine.py +++ b/tests/integration/resource_manager/test_engine.py @@ -1,4 +1,3 @@ -import time from collections import namedtuple import pytest @@ -13,13 +12,13 @@ def make_engine_name(database_name: str, suffix: str) -> str: - return f"{database_name}_{suffix}_{int(time.time())}" + return f"{database_name}_{suffix}" @pytest.mark.skip(reason="manual test") def test_create_start_stop_engine(database_name: str): rm = ResourceManager() - name = make_engine_name(database_name, "create_start_stop_eng") + name = make_engine_name(database_name, "start_stop") engine = rm.engines.create(name=name) assert engine.name == name @@ -46,7 +45,7 @@ def test_create_start_stop_engine(database_name: str): @pytest.mark.skip(reason="manual test") def test_copy_engine(database_name): rm = ResourceManager() - name = make_engine_name(database_name, "copy_engine") + name = make_engine_name(database_name, "copy") engine = rm.engines.create(name=name) assert engine.name == name @@ -115,7 +114,7 @@ def get_engine_params(rm: ResourceManager, engine: Engine): def test_engine_update_single_parameter(rm_settings: Settings, database_name: str): rm = ResourceManager(rm_settings) - name = make_engine_name(database_name, "engine_single_parameter") + name = make_engine_name(database_name, "single_param") engine = rm.engines.create(name=name) engine.attach_to_database(database=rm.databases.get_by_name(database_name)) @@ -134,7 +133,7 @@ def test_engine_update_single_parameter(rm_settings: Settings, database_name: st def test_engine_update_multiple_parameters(rm_settings: Settings, database_name: str): rm = ResourceManager(rm_settings) - name = make_engine_name(database_name, "engine_multi_parameter") + name = make_engine_name(database_name, "multi_param") engine = rm.engines.create(name=name) engine.attach_to_database(database=rm.databases.get_by_name(database_name))