feat(tests): update GitHub Actions workflow to parse merged JUnit results and improve directory structure

Author: s3ich4n

.github/workflows/pr-test.yml

@@ -47,36 +47,35 @@ jobs:
           ")
           echo "COVERAGE_PERCENT=$percentage" >> "$GITHUB_OUTPUT"
 
-      - name: Parse JUnit Results for Summary
+      - name: Parse Merged JUnit Results for Summary (only merged-results.xml)
         id: junit-summary
         run: |
           summary=$(poetry run python -c "
           import xml.etree.ElementTree as ET
-          import glob
+          
+          tree = ET.parse('test-results/merged-results.xml')
+          root = tree.getroot()
+          
+          # 'testsuites' 또는 'testsuite'에 따라 동작 다름 (방어코드)
+          if root.tag == 'testsuites':
+              suites = root.findall('testsuite')
+          elif root.tag == 'testsuite':
+              suites = [root]
+          else:
+              raise ValueError(f'Unexpected root tag: {root.tag}')
           
           total_tests = 0
           total_failures = 0
           total_skipped = 0
           total_errors = 0
           total_time = 0.0
           
-          for file in glob.glob('test-results/*.xml'):
-              tree = ET.parse(file)
-              root = tree.getroot()
-          
-              if root.tag == 'testsuites':
-                  suites = root.findall('testsuite')
-              elif root.tag == 'testsuite':
-                  suites = [root]
-              else:
-                  raise ValueError(f'Unexpected root tag: {root.tag}')
-          
-              for suite in suites:
-                  total_tests += int(suite.attrib.get('tests', 0))
-                  total_failures += int(suite.attrib.get('failures', 0))
-                  total_skipped += int(suite.attrib.get('skipped', 0))
-                  total_errors += int(suite.attrib.get('errors', 0))
-                  total_time += float(suite.attrib.get('time', 0))
+          for suite in suites:
+              total_tests += int(suite.attrib.get('tests', 0))
+              total_failures += int(suite.attrib.get('failures', 0))
+              total_skipped += int(suite.attrib.get('skipped', 0))
+              total_errors += int(suite.attrib.get('errors', 0))
+              total_time += float(suite.attrib.get('time', 0))
           
           passed = total_tests - total_failures - total_skipped
           print(f'PASSED={passed}')
@@ -87,10 +86,10 @@ jobs:
           
           echo "$summary" >> "$GITHUB_OUTPUT"
 
-      - name: Publish Test Results Summary (optional)
+      - name: Publish Merged Test Results Summary
         uses: test-summary/action@v2
         with:
-          paths: "test-results/*.xml"
+          paths: "test-results/merged-results.xml"
         if: always()
 
       - name: Upload Coverage HTML Report
@@ -99,7 +98,7 @@ jobs:
           name: coverage-html
           path: htmlcov/
 
-      - name: Upload JUnit XML (for archive)
+      - name: Upload All JUnit XML Files (for archive)
         uses: actions/upload-artifact@v4
         with:
           name: junit-xml-reports

Makefile

@@ -1,7 +1,9 @@
-.PHONY: test test-all test-ch01 test-ch04 test-ch06 test-ch07 clean clean-coverage clean-results combine-coverage merge-junit
+.PHONY: test test-all clean clean-coverage clean-results combine-coverage merge-junit
 
 CHAPTERS = ch01 ch04 ch06 ch07
 TEST_RESULTS_DIR = test-results
+COVERAGE_DIR = $(TEST_RESULTS_DIR)/coverage
+JUNIT_DIR = $(TEST_RESULTS_DIR)/junit
 
 # Poetry 환경 강제
 POETRY ?= poetry run
@@ -18,43 +20,29 @@ clean-results:
 
 clean-coverage:
 	$(POETRY) coverage erase
-	rm -f $(TEST_RESULTS_DIR)/.coverage*
+	rm -f $(COVERAGE_DIR)/.coverage*
 
-test-all: clean-results clean-coverage $(TEST_RESULTS_DIR) test-ch01 test-ch04 test-ch06 test-ch07 combine-coverage merge-junit
+test-all: clean-results clean-coverage $(TEST_RESULTS_DIR) run-all combine-coverage merge-junit
 
-test-ch01:
-	cd chapter01 && \
-	COVERAGE_FILE=../$(TEST_RESULTS_DIR)/.coverage.ch01 $(POETRY) coverage run -m pytest -v \
-	    --junitxml=../$(TEST_RESULTS_DIR)/ch01-results.xml
-
-test-ch04:
-	cd chapter04 && \
-	COVERAGE_FILE=../$(TEST_RESULTS_DIR)/.coverage.ch04 $(POETRY) coverage run -m pytest -v \
-	    --junitxml=../$(TEST_RESULTS_DIR)/ch04-results.xml
-
-test-ch06:
-	cd chapter06 && \
-	COVERAGE_FILE=../$(TEST_RESULTS_DIR)/.coverage.ch06 $(POETRY) coverage run -m pytest -v \
-	    --junitxml=../$(TEST_RESULTS_DIR)/ch06-results.xml
-
-test-ch07:
-	cd chapter07 && \
-	COVERAGE_FILE=../$(TEST_RESULTS_DIR)/.coverage.ch07 $(POETRY) coverage run -m pytest -v \
-	    --junitxml=../$(TEST_RESULTS_DIR)/ch07-results.xml
+run-all:
+	@for chapter in $(CHAPTERS); do \
+		echo "Running tests for $$chapter..."; \
+		(cd $$chapter && \
+		COVERAGE_FILE=../$(COVERAGE_DIR)/.coverage.$$chapter \
+		$(POETRY) coverage run -m pytest -v \
+		--junitxml=../$(JUNIT_DIR)/$$chapter-results.xml) || exit $$?; \
+	done
 
 combine-coverage:
-	$(POETRY) coverage combine $(TEST_RESULTS_DIR)
+	$(POETRY) coverage combine $(COVERAGE_DIR)
 	$(POETRY) coverage report
 	$(POETRY) coverage html
 
 merge-junit:
 	$(POETRY) python -m pip show junitparser > /dev/null || $(POETRY) python -m pip install junitparser
 	$(POETRY) python -m junitparser merge \
-	    $(TEST_RESULTS_DIR)/ch01-results.xml \
-	    $(TEST_RESULTS_DIR)/ch04-results.xml \
-	    $(TEST_RESULTS_DIR)/ch06-results.xml \
-	    $(TEST_RESULTS_DIR)/ch07-results.xml \
-	    $(TEST_RESULTS_DIR)/merged-results.xml
+		$(JUNIT_DIR)/*.xml \
+		$(TEST_RESULTS_DIR)/merged-results.xml
 
 $(TEST_RESULTS_DIR):
-	mkdir -p $(TEST_RESULTS_DIR)
+	mkdir -p $(COVERAGE_DIR) $(JUNIT_DIR)