test: fix test_changelog_incremental_with_merge_prerelease issue with freeze_time

actions-user · actions-user · commit 3c9c89cabf49 · 2023-04-17T19:18:17.000+03:00
#703
diff --git a/tests/commands/test_bump_command.py b/tests/commands/test_bump_command.py
@@ -980,4 +980,3 @@ def test_bump_use_version_provider(mocker: MockFixture):
 get_provider.assert_called_once()
 mock.get_version.assert_called_once()
 mock.set_version.assert_called_once_with("0.0.1")
-
diff --git a/tests/commands/test_changelog_command.py b/tests/commands/test_changelog_command.py
@@ -696,6 +696,7 @@ def test_changelog_release_candidate_version_with_merge_prerelease(
 
 @pytest.mark.parametrize("test_input", ["rc", "alpha", "beta"])
 @pytest.mark.usefixtures("tmp_commitizen_project")
+@pytest.mark.freeze_time("2023-04-16")
 def test_changelog_incremental_with_merge_prerelease(
 mocker: MockFixture, changelog_path, file_regression, test_input
 ):
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,9 +1,8 @@
 import os
 import re
 import tempfile
-
-from typing import Optional
 from pathlib import Path
+from typing import Optional
 
 import pytest
 

-Original file line number
+Diff line change
@@ @@ -1,9 +1,8 @@ @@
 importos
 importre
 importtempfile
+-
 -fromtypingimportOptional
 frompathlibimportPath
 +fromtypingimportOptional
 importpytest