riqi <dZddlZddlZddlZddlZddlmZddlmZddl m Z m Z m Z m Z ddlZeejj!ddZeeej&vr"ej&j)deeedz Zeeej&vr"ej&j)deedd lmZmZd ed ed ed ededef dZd ed edefdZdeddfdZGddZej<dedeeddffdZGddZ y)u test_auto_merge_stash_isolation.py task-2418: PreFlightCheck T1+T2 stash 격리 fix 회귀 테스트 작성자: 모리건 (dev3 팀 테스터) 테스트 항목: 단위 테스트 (8개) - TestPreFlightCheckStashIsolationUnit 1. test_simulate_merge_passes_affected_files_to_stash 2. test_simulate_merge_metadata_missing_dirty_returns_conflict 3. test_simulate_merge_metadata_missing_clean_skips_stash 4. test_get_task_affected_files_parses_modify_and_create_only 5. test_stash_pop_with_retry_succeeds_after_one_failure 6. test_stash_pop_with_retry_raises_after_three_failures 7. test_find_stash_by_msg_searches_correct_ref_among_multiple_stashes 8. test_run_groups_task_ids_per_project_path 통합 테스트 (4개) - TestPreFlightCheckStashIsolationIntegration 9. test_integration_stash_whitelist_includes_untracked 10. test_integration_concurrent_stash_apply_correct_ref 11. test_integration_apply_drop_removes_stash 12. test_integration_apply_conflict_triggers_notify N)Path) Generator) MagicMockMockcallpatchWORKSPACE_ROOTz/home/jay/workspacescripts)PreFlightCheckPreFlightCheckErrorbasetask_id modify_files create_filesforbidden_filesreturnc|dz dz }|jdd||dz }d|dddg}|r-|jd |D]}|jd |d |r-|jd |D]}|jd |d |r-|jd |D]}|jd |d |jdj|d|S)u<task md 파일을 ## affected_files 섹션과 함께 생성.memorytasksTparentsexist_ok.md#  z## affected_files u ### 수정 z- `z` u ### 신규 u### 변경 금지 utf-8encoding)mkdirappend write_textjoin) r rrrr tasks_dirmd_pathlinesfs .mock_subprocess_run}sGVF !F FMFM#~&C- '', 4 Mr*subprocess.run side_effect_is_working_tree_dirtyT return_valuetask_idsNu4git stash push가 최소 1회 호출되어야 한다r--include-untrackedu$--include-untracked 플래그 필요r;u-m 메시지 플래그 필요--u-- 구분자 필요u&이 stash push 파일 목록에 없음u플래그 순서가 잘못됨) r)r>setenvr robjectsimulate_mergelenindex)selfrC monkeypatchrrr project_pathpfcrW stash_call dash_dash_idx file_argsr' idx_untrackedidx_m idx_dash_dashrVs @r(2test_simulate_merge_passes_affected_files_to_stashzWTestPreFlightCheckStashIsolationUnit.test_simulate_merge_passes_affected_files_to_stashms() +, #Hg|\SUV8} +S];CM: #1D E Ic#;$O I""<wi"H I I #$)a+aa)%a( $ 2Z4ZZ2z!B#BB!z!8#88!#((. }q012  , PA > OaS(N#O O> P#(()>?   &"((. u4}4U6UU4U6UU4+ I I I Is$(E-E!E-!E* &E--E6c d}t||t|}|jdt|tt|}gt j |dd5t j |dfd 5|j |g|g }d d d d d d d d usJdt|ddk\sJd|ddddk(sJdtdk(sJdy #1swYbxYw#1swYfxYw)uWaffected_files 없는 task + dirty working tree → metadata_missing conflict + 알림.z task-2000r rHr[Tr\_notify_chairman_stash_failurec&j|SNr!akw notify_callss r(zrTestPreFlightCheckStashIsolationUnit.test_simulate_merge_metadata_missing_dirty_returns_conflict..sbnbubuvwbxr*rYr^NpassedFupassed=False이어야 한다 conflictsr`u(conflicts가 최소 1개이어야 한다rbranch__metadata_missing__u.branch가 __metadata_missing__이어야 한다=_notify_chairman_stash_failure가 1회 호출되어야 한다r,r>rcr rrdrerf)rhrCrirrjrkrUr{s @r(;test_simulate_merge_metadata_missing_dirty_returns_conflictz`TestPreFlightCheckStashIsolationUnit.test_simulate_merge_metadata_missing_dirty_returns_conflicts'!(G48} +S];CM: \\#7d K Rc#CQxy R++L"y+Q R Rh5(H*HH(6+&'1,X.XX,k"1%h/3II{K{{I< A%f'ff%  R R R Rs$%DC8D8D =DD cd}t||t|}|jdt|tt|}gfd}t j |dd5t d| 5|j |g|g }d d d d d d td k(sJd dgk(sJdy #1swY6xYw#1swY:xYw)uKaffected_files 없는 task + clean working tree → stash push 호출 0건.z task-3000r rHcxt}d|_d|_d|_d|vrd|vrj ||S)NrrrKrLrNrRs r(rWzxTestPreFlightCheckStashIsolationUnit.test_simulate_merge_metadata_missing_clean_skips_stash..mock_subprocess_runs@VF !F FMFM#~&C- '',Mr*r[Fr\rXrYr^NruKclean working tree에서는 git stash push를 호출하지 않아야 한다r~u$conflicts가 비어 있어야 한다r) rhrCrirrjrkrWrUrVs @r(6test_simulate_merge_metadata_missing_clean_skips_stashz[TestPreFlightCheckStashIsolationUnit.test_simulate_merge_metadata_missing_clean_skips_stashs!(G48} +S];CM: \\#7e L R'5HI R++L"y+Q R R#$)x+xx)k"b(P*PP(  R R R Rs$*C8CCC CCc<d}dg}dg}ddg}t||||||jdt|tt|}|j |g}||vs J|d||} d| vsJd d| vsJd d| vsJd d| vsJd y ) uA수정/신규 섹션만 파싱하고 변경 금지 섹션 제외.z task-4000rFrGzscripts/bar.pyz dispatch.pyr rHu가 결과에 없음u'수정 파일이 포함되어야 한다u'신규 파일이 포함되어야 한다u.변경 금지 파일이 제외되어야 한다N)r)rcr>r _get_task_affected_files) rhrCrirrrrrkrUfiless r(:test_get_task_affected_files_parses_modify_and_create_onlyz_TestPreFlightCheckStashIsolationUnit.test_get_task_affected_files_parses_modify_and_create_onlys() +, +];#Hg|\Sbc+S];CM:--wi8& BWI-A"BB w5(S*SS("e+V-VV+u,^.^^,E)[+[[)r*c t|}|jdt|tt|}dgfd}tj|dd5td| 5td 5|j |dd d gd d d d d d d d d ddk(sJdy #1swY)xYw#1swY-xYw#1swY1xYw)uKstash apply 첫 번째 실패 → 두 번째 시도 성공 → drop 성공.r rHrct}d|_d|_d|_d|vr2d|vr.dxxdz cc<ddk(rd|_d|_|Sd|_|Sd|vr d|vrd|_|S)NrrrKapplyr`z apply faileddroprrOrPrQ)rSrTrU call_counts r(rWzvTestPreFlightCheckStashIsolationUnit.test_stash_pop_with_retry_succeeds_after_one_failure..mock_subprocess_runsVF !F FMFM#~'S.1 " a=A%()F%$2FM M )*F%MCFcM$%!Mr*_find_stash_by_msg stash@{0}r\rXrY time.sleeppreflight-task-1001-123rENuFstash apply가 2회 호출되어야 한다 (1회 실패 + 1회 성공))r>rcr rrd_stash_pop_with_retry)rhrCrirjrkrWrs @r(4test_stash_pop_with_retry_succeeds_after_one_failurezYTestPreFlightCheckStashIsolationUnit.test_stash_pop_with_retry_succeeds_after_one_failures8} +S];CM:S  $\\#3+ N s'5HI s<(s--lKIbepdqrs s s !}!k#kk! ss s s s ss<C + C7B5 CC 5B> :CC C  Cc t|}|jdt|tt|}dgfd}gtj|dd5td| 5td 5tj|d fd  5t j t5|j|dd dgdddddddddddddddddk(sJdtdk(sJdy#1swYNxYw#1swYRxYw#1swYVxYw#1swYZxYw#1swY^xYw)ucstash apply 3회 모두 실패 → _notify_chairman_stash_failure 1회 + PreFlightCheckError raise.r rHrcpt}d|_d|_d|_d|vrd|vr dxxdz cc<|S)Nr`rzapply conflictrKrrr)rSrTrU apply_counts r(rWzwTestPreFlightCheckStashIsolationUnit.test_stash_pop_with_retry_raises_after_three_failures..mock_subprocess_run)s@VF !F FM,FM#~'S.A!#Mr*rrr\rXrYrrtc&j|Srvrwrxs r(r|zlTestPreFlightCheckStashIsolationUnit.test_stash_pop_with_retry_raises_after_three_failures..9sjvj}j}~kAr*rrENu*stash apply가 3회 시도되어야 한다r`r) r>rcr rrdpytestraisesr rrf)rhrCrirjrkrWrr{s @@r(5test_stash_pop_with_retry_raises_after_three_failureszZTestPreFlightCheckStashIsolationUnit.test_stash_pop_with_retry_raises_after_three_failures sE8} +S];CM:c   \\#3+ N '5HI <(c+KZAB#]]+>?55 ,k;TWbVc  1~"P$PP"< A%f'ff%     sl E. D7:D+D 0D D D+D7EDD D( $D++D4 0D77E <EE ct|}|jdt|tt|}dfd}td|5|j |d}dddd k(s Jd |y#1swYxYw) u-stash list에서 msg로 정확한 ref 반환.r rHzzstash@{0} On main: other-bot-stash stash@{1} On main: preflight-task-1001-1234567890 stash@{2} On main: yet-another-stash cFt}d|_|_d|_|S)Nrrr)rSrTrUstash_list_outputs r(rWzTestPreFlightCheckStashIsolationUnit.test_find_stash_by_msg_searches_correct_ref_among_multiple_stashes..mock_subprocess_runSs%VF !F -FMFMMr*rXrYzpreflight-task-1001-1234567890Nz stash@{1}u예상 ref=stash@{1}, 실제=)r>rcr rr)rhrCrirjrkrWrefrs @r(Btest_find_stash_by_msg_searches_correct_ref_among_multiple_stasheszgTestPreFlightCheckStashIsolationUnit.test_find_stash_by_msg_searches_correct_ref_among_multiple_stashesFs8} +S];CM: 5   #1D E Y((7WXC Yk!J%DSE#JJ! Y Ys A<<Bc |jdt|tt|}ddddddddd d d dg}g d fd }tj|d|5tj|d|5|j dd d d d d d t dk(sJdt d Dcic]}|d| }}|jd}|Jdt|dddhk(sJdt|dddhk(sJd|jd } | Jd| dd gk(sJd| dd gk(sJdy #1swYxYw#1swYxYwcc}w) ud같은 project_path 두 task → simulate_merge 1회 (task_ids 2개), 다른 path → 별도 호출.r rHztask-Azbranch-Az /proj/alpha)rrrjztask-Bzbranch-Bztask-Czbranch-Cz /proj/betaNc8j|||ddgdS)N)rjbranchesr_T)r}r~rw)rjrr_simulate_callss r(mock_simulate_mergezkTestPreFlightCheckStashIsolationUnit.test_run_groups_task_ids_per_project_path..mock_simulate_mergeqs,  ! ! ,$$#  #4 4r*find_merge_branchesr\rerYzbatch-test-001ru1simulate_merge가 2회 호출되어야 하는데 회rju5/proj/alpha에 대한 simulate_merge 호출이 없음rualpha branches가 맞지 않음r_ualpha task_ids가 맞지 않음u4/proj/beta에 대한 simulate_merge 호출이 없음ubeta branches가 맞지 않음ubeta task_ids가 맞지 않음rv) rcr>r rrdr=rfgetset) rhrCrirk branch_infosrc calls_by_path alpha_call beta_callrs @r()test_run_groups_task_ids_per_project_pathzNTestPreFlightCheckStashIsolationUnit.test_run_groups_task_ids_per_project_pathcs+S];CM:!J V J V J U  5\\#4< P *c#3ATU *() * * >"a'u+\]`ao]p\qqt)uu'8FF!>*A-F F"&&}5 %^'^^%:j)*z:.FFiHiiF:j)*x.BBeDeeB!%%l3 $\&\\$$ 4V6VV4$ 2T4TT2# * * * *Gs*#E(<EE( E4E% !E((E1N) __name__ __module__ __qualname____doc__rrrrrrrrrrr*r(rBrBfs|/ 2V42VpgTXg2QtQB\SW\4!lT!lN gd gLK[_K:(U$(Ur*rBrCc#4K|dz }t||yw)u4실 임시 git repo 픽스처: init + 초기 커밋.repoN)r@)rCrs r(git_repors f D4 JscPeZdZdZdedefdZdedefdZdedefdZdedefdZy) +TestPreFlightCheckStashIsolationIntegrationu-통합 테스트 (실 임시 git repo, 4개).rrCc|jdt||dz }|jdd|dz }|jddtt|}d }|j t||ddg}t j gd t|d d d } | jjdk(sJd| jt j gdt|d d d } || jvsJd|d| j| jjddk\sJd|Jdy)u@tracked 수정 + untracked 추가 파일 모두 stash에 포함.r r7zmodified content rrznew_untracked.pyzprint('hello') rHzpreflight-task-1001-test)r/statusz --porcelainTFr2r3textr4ru+stash 후 working tree가 clean해야 함: r/rKlistustash list에 u 가 없음: rr`u&stash ref가 최소 1개 있어야 함Nu0_stash_whitelist가 None을 반환하면 안 됨) rcr>r"r _stash_whitelistr<r=rPstripcount) rhrrCri tracked_fileuntracked_filerk stash_msg stash_ref status_resultstash_list_results r(3test_integration_stash_whitelist_includes_untrackedz_TestPreFlightCheckStashIsolationIntegration.test_integration_stash_whitelist_includes_untrackedsr+S]; +-  4wG"$66!!"4w!GCM:. (( M  , - # ,H   ##))+r1w5`anauau`v3ww1'NN $H   -444xykQ]^o^v^v]w6xx4 ''--d3q8b:bb8$X&XX$r*c F|jdt|tt|}|dz }|jddt j gdt|dd d }t j d d ddd|ddgt|dd |dz }|jddd}t j d d ddd|ddgt|dd |j t||} | Jd|d| dk7s Jd| tj|d5|jt|| |dgdddt j gdt|ddd j} || vsJd|| vsJdy#1swYOxYw) ug다그다 stash 후 다른 봇 stash → _find_stash_by_msg가 다그다 stash의 정확한 ref 반환.r rHdagda.pyz dagda = True rr)r/r8rTFr1zpreflight-task-1001-dagdar/rKrLrar;rbz other_bot.pyz other = True zpreflight-task-2002-otherNu*다그다 stash ref를 찾지 못함 (msg=)ruM다른 봇이 stash@{0}이므로 다그다는 stash@{0}이 아니어야 함: rtrErru%다그다 stash가 drop 되어야 함u$다른 봇 stash는 잔존해야 함) rcr>r r"r<r=rrrdrrP) rhrrCrirk dagda_filedagda_stash_msg other_fileother_stash_msg found_ref stash_lists r(3test_integration_concurrent_stash_apply_correct_refz_TestPreFlightCheckStashIsolationIntegration.test_integration_concurrent_stash_apply_correct_refs+S];CM: * .A1s8}UYafg5 GV%:D/SWYc dH   . .A5 GV%:D/SWYg hH   **3x=/J $e(RSbRccd&ee$K' I+|~G}H*I I'\\#? @ `  % %c(mYR]Q^ _ ` ^^ $H   & j0Y2YY0*,T.TT, ` `s *FF c|jdt|tt|}|dz }|jddd}|j t||dg}|Jd |j r|j dk7sJd tj|d 5|jt|||d gdddtjgd t|dddj}|jdk(s Jd||j sJd|j dk(sJd|j y#1swYxYw)uBstash → apply + drop → stash list 비어 있고 변경 복원.r rHz target.pyzx = 42 rrzpreflight-task-5000-apply-dropNstash_ref가 None이면 안 됨u;stash 후 target.py가 이전 상태이거나 없어야 함rtz task-5000rTFrru9stash apply+drop 후 stash list가 비어 있어야 함: u target.py가 복원되어야 함u)target.py 내용이 복원되어야 함: )rcr>r r"rexists read_textrrdrr<r=rPr) rhrrCrirk test_filerrrs r()test_integration_apply_drop_removes_stashzUTestPreFlightCheckStashIsolationIntegration.test_integration_apply_drop_removes_stash s+S];CM:{* Z':4 ((X K=Q $G&GG$##%)<)<)>*)L J I JL\\#? @ Z  % %c(mY K= Y Z ^^ $H   & !R'q+deodp)qq'!E#EE!""$ 2w6_`i`s`s`u_v4ww2 Z Zs 1E''E0c  |jdt|tt|}|dz }|jddd}|j t||dg}|Jd |jd dg t j |d fd  5t d5tjt5|jt|||dgdddddddddt dk(sJdt dtjgdt|dddj}||vs Jd|y#1swYyxYw#1swY}xYw#1swYxYw)ufstash 후 같은 파일 변경 → apply 시 conflict → 알림 + PreFlightCheckError + stash 잔존.r rHz conflict.pyz version = 1 rrzpreflight-task-6000-conflictNrzversion = 999 rtc&j|Srvrwrxs r(r|zmTestPreFlightCheckStashIsolationIntegration.test_integration_apply_conflict_triggers_notify..Is^j^q^qrs^tr*rYrz task-6000r`uA_notify_chairman_stash_failure가 1회 호출되어야 하는데 rrTFru*실패 시 stash ref가 잔존해야 함: )rcr>r r"rrrdrrr rrfr<r=rP) rhrrCrirk conflict_filerrrr{s @r(/test_integration_apply_conflict_triggers_notifyz[TestPreFlightCheckStashIsolationIntegration.test_integration_apply_conflict_triggers_notify5s+S];CM:!=0   7 C2 ((X M?S $G&GG$   !2W E \\#?Mt u b|$ b]]#67b--c(mY T_S`ab b b < A% B)jkno{k|j}~A(B B% ^^ $H   & J&a*TU_T`(aa&bb b b b bs<" E7.E+E'E+/E7E( $E++E4 0E77FN) rrrrrrrrrrr*r(rrsd7 *YD*Y\`*Y`3UD3U\`3Ur$x$$xRV$xT$b$bX\$br*r)!rosr<systimepathlibrtypingr unittest.mockrrrrrenvironr WORKSPACEr>pathinsertSCRIPTS auto_merger r rr)r,r@rBfixturerrrr*r(rsR0  66   02GH I y>!HHOOAs9~& i w