Skip to content

Commit 32ef07b

Browse files
committed
Fix rebase error
1 parent 499eca2 commit 32ef07b

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

dolphinscheduler-python/pydolphinscheduler/tests/core/test_process_definition.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,6 @@ def test_process_definition_simple():
195195
}
196196

197197

198-
def test_schedule_json_none_schedule():
199-
"""Test function schedule_json with None as schedule."""
200-
with ProcessDefinition(
201-
TEST_PROCESS_DEFINITION_NAME,
202-
schedule=None,
203-
) as pd:
204-
assert pd.schedule_json is None
205-
206-
207-
# We freeze time here, because we test start_time with None, and if will get datetime.datetime.now. If we do
208-
# not freeze time, it will cause flaky test here.
209-
@freeze_time("2021-01-01")
210198
@pytest.mark.parametrize(
211199
"user_attrs",
212200
[
@@ -235,6 +223,18 @@ def test_set_process_definition_user_attr(user_attrs):
235223
), f"Except attribute is {except_attr} but get {actual_attr}"
236224

237225

226+
def test_schedule_json_none_schedule():
227+
"""Test function schedule_json with None as schedule."""
228+
with ProcessDefinition(
229+
TEST_PROCESS_DEFINITION_NAME,
230+
schedule=None,
231+
) as pd:
232+
assert pd.schedule_json is None
233+
234+
235+
# We freeze time here, because we test start_time with None, and if will get datetime.datetime.now. If we do
236+
# not freeze time, it will cause flaky test here.
237+
@freeze_time("2021-01-01")
238238
@pytest.mark.parametrize(
239239
"start_time,end_time,expect_date",
240240
[

0 commit comments

Comments
 (0)