Merge branch 'main' into hod/retry

microsoft · May 23, 2024 · b04e86a · b04e86a
2 parents aa84ab7 + fa41c1b
commit b04e86a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/src/promptflow-core/pyproject.toml b/src/promptflow-core/pyproject.toml
@@ -95,7 +95,6 @@ markers = [
 # durations - list the slowest test durations
 addopts = """
 --junit-xml=test-results.xml \
---dist loadfile \
 --log-level=info \
 --log-format="%(asctime)s %(levelname)s %(message)s" \
 --log-date-format="[%Y-%m-%d %H:%M:%S]" \

diff --git a/src/promptflow-core/tests/conftest.py b/src/promptflow-core/tests/conftest.py
@@ -104,7 +104,7 @@ def start_patches(patch_targets):
         from promptflow.recording.record_mode import check_pydantic_v2
 
         check_pydantic_v2()
-        file_path = RECORDINGS_TEST_CONFIGS_ROOT / "node_cache.shelve"
+        file_path = RECORDINGS_TEST_CONFIGS_ROOT / "core_node_cache.shelve"
         RecordStorage.get_instance(file_path)
 
         from promptflow._core.tool import tool as original_tool

diff --git a/src/promptflow-recording/recordings/local/core_node_cache.shelve.bak b/src/promptflow-recording/recordings/local/core_node_cache.shelve.bak
@@ -0,0 +1,2 @@
+'ab3563e99d1ee052e067952ab332536a6bf5c025', (0, 1308)
+'67b119c190b574a9a275e8bdd93bcd06487d5318', (1536, 4997)
diff --git a/src/promptflow-recording/recordings/local/core_node_cache.shelve.dat b/src/promptflow-recording/recordings/local/core_node_cache.shelve.dat
diff --git a/src/promptflow-recording/recordings/local/core_node_cache.shelve.dir b/src/promptflow-recording/recordings/local/core_node_cache.shelve.dir
@@ -0,0 +1,2 @@
+'ab3563e99d1ee052e067952ab332536a6bf5c025', (0, 1308)
+'67b119c190b574a9a275e8bdd93bcd06487d5318', (1536, 4997)
diff --git a/src/promptflow/tests/executor/e2etests/test_logs.py b/src/promptflow/tests/executor/e2etests/test_logs.py
@@ -95,8 +95,10 @@ def test_executor_logs(self, folder_name):
             executor.exec_line({"text": "line_text"})
             log_content = load_content(flow_run_log_path)
             loggers_name_list = ["execution", "execution.flow"]
-            assert all(logger in log_content for logger in loggers_name_list)
-            assert 6 == count_lines(flow_run_log_path)
+            missing_loggers = [logger for logger in loggers_name_list if logger not in log_content]
+            assert not missing_loggers, f"Missing loggers: {missing_loggers}\nLog content:\n---\n{log_content}"
+            line_count = count_lines(flow_run_log_path)
+            assert 6 == line_count, f"Expected 6 lines in log, but got {line_count}\nLog content:\n---\n{log_content}"
 
         # bulk run: test batch_engine.run
         # setting run_mode to BulkTest is a requirement to use bulk_logger
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		'ab3563e99d1ee052e067952ab332536a6bf5c025', (0, 1308)
		'67b119c190b574a9a275e8bdd93bcd06487d5318', (1536, 4997)