-
-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathtest_git_additional.py
More file actions
1009 lines (751 loc) · 32.9 KB
/
test_git_additional.py
File metadata and controls
1009 lines (751 loc) · 32.9 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
"""Additional tests for git.py to increase coverage to >90%."""
from unittest.mock import Mock
from unittest.mock import patch
import pytest
def test_git_error_class():
"""Test GitError exception class."""
from mxdev.vcs.common import WCError
from mxdev.vcs.git import GitError
assert issubclass(GitError, WCError)
def test_git_working_copy_duplicate_rev_and_revision():
"""Test GitWorkingCopy raises error when both rev and revision are specified."""
from mxdev.vcs.git import GitWorkingCopy
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
"rev": "abc123",
"revision": "def456",
}
with pytest.raises(ValueError, match="duplicate revision options"):
GitWorkingCopy(source)
def test_git_working_copy_revision_converted_to_rev():
"""Test that 'revision' is converted to 'rev'."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
"revision": "abc123",
}
wc = GitWorkingCopy(source)
assert "rev" in wc.source
assert wc.source["rev"] == "abc123"
assert "revision" not in wc.source
def test_git_working_copy_rev_removes_default_branch():
"""Test that specifying rev removes default branch 'main'."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
"rev": "abc123",
"branch": "main",
}
wc = GitWorkingCopy(source)
assert "branch" not in wc.source
def test_git_working_copy_rev_with_non_main_branch_errors():
"""Test that specifying both rev and non-main branch causes exit."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
"rev": "abc123",
"branch": "develop",
}
with pytest.raises(SystemExit):
GitWorkingCopy(source)
def test_git_version_returncode_error():
"""Test git_version handles git --version failure."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 1
mock_process.communicate.return_value = ("error", "error message")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(SystemExit):
wc.git_version()
def test_git_version_parse_error():
"""Test git_version handles unparseable version output."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("invalid version output", "")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(SystemExit):
wc.git_version()
def test_git_version_too_old():
"""Test git_version exits on git < 1.5."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("git version 1.4.0", "")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(SystemExit):
wc.git_version()
def test_git_version_parsing_two_parts():
"""Test git_version parses version with 2 parts."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("git version 2.5", "")
with patch.object(wc, "run_git", return_value=mock_process):
version = wc.git_version()
assert version == (2, 5)
def test_git_version_parsing_four_parts():
"""Test git_version parses version with 4 parts."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("git version 2.30.1.2", "")
with patch.object(wc, "run_git", return_value=mock_process):
version = wc.git_version()
assert version == (2, 30, 1, 2)
def test_remote_branch_prefix_old_git():
"""Test _remote_branch_prefix for git < 1.6.3."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
with patch.object(wc, "git_version", return_value=(1, 5, 0)):
assert wc._remote_branch_prefix == "origin"
def test_remote_branch_prefix_new_git():
"""Test _remote_branch_prefix for git >= 1.6.3."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
with patch.object(wc, "git_version", return_value=(2, 30, 0)):
assert wc._remote_branch_prefix == "remotes/origin"
def test_git_merge_rbranch_failure():
"""Test git_merge_rbranch handles git branch failure."""
from mxdev.vcs.git import GitError
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 1
mock_process.communicate.return_value = ("", "branch command failed")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(GitError, match="git branch -a"):
wc.git_merge_rbranch("", "")
def test_git_merge_rbranch_missing_branch_accept():
"""Test git_merge_rbranch with missing branch and accept_missing=True."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
"branch": "nonexistent",
}
wc = GitWorkingCopy(source)
# Mock git branch -a to return branches without our target branch
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("* main\n develop\n", "")
with patch.object(wc, "run_git", return_value=mock_process):
stdout, stderr = wc.git_merge_rbranch("", "", accept_missing=True)
assert stdout == "* main\n develop\n"
def test_git_merge_rbranch_missing_branch_no_accept():
"""Test git_merge_rbranch with missing branch and accept_missing=False."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
"branch": "nonexistent",
}
wc = GitWorkingCopy(source)
# Mock git branch -a to return branches without our target branch
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("* main\n develop\n", "")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(SystemExit):
wc.git_merge_rbranch("", "", accept_missing=False)
def test_git_merge_rbranch_merge_failure():
"""Test git_merge_rbranch handles merge failure."""
from mxdev.vcs.git import GitError
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
"branch": "main",
}
wc = GitWorkingCopy(source)
def mock_run_git_side_effect(commands, **kwargs):
mock_proc = Mock()
if "branch" in commands:
mock_proc.returncode = 0
mock_proc.communicate.return_value = ("* main\n", "")
else: # merge command
mock_proc.returncode = 1
mock_proc.communicate.return_value = ("", "merge conflict")
return mock_proc
with patch.object(wc, "run_git", side_effect=mock_run_git_side_effect):
with patch.object(wc, "git_version", return_value=(2, 30, 0)):
with pytest.raises(GitError, match="git merge"):
wc.git_merge_rbranch("", "")
def test_git_checkout_existing_path(tmp_path):
"""Test git_checkout when path already exists."""
from mxdev.vcs.git import GitWorkingCopy
test_dir = tmp_path / "test-package"
test_dir.mkdir()
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": str(test_dir),
}
wc = GitWorkingCopy(source)
result = wc.git_checkout(submodules="never")
# Should return None when path exists
assert result is None
def test_git_checkout_clone_failure():
"""Test git_checkout handles clone failure."""
from mxdev.vcs.git import GitError
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/nonexistent/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 1
mock_process.communicate.return_value = ("", "clone failed")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(GitError, match="git cloning"):
wc.git_checkout(submodules="never")
def test_git_checkout_with_depth():
"""Test git_checkout with depth parameter."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test-depth",
"depth": "1",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("cloned", "")
with patch.object(wc, "run_git", return_value=mock_process) as mock_run:
wc.git_checkout(submodules="never")
# Verify --depth was included in clone command
call_args = mock_run.call_args[0][0]
assert "--depth" in call_args
assert "1" in call_args
def test_git_checkout_with_git_clone_depth_env():
"""Test git_checkout uses GIT_CLONE_DEPTH environment variable."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.git.GIT_CLONE_DEPTH", "5"):
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test-env-depth",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("cloned", "")
with patch.object(wc, "run_git", return_value=mock_process) as mock_run:
wc.git_checkout(submodules="never")
# Verify --depth with env value was included
call_args = mock_run.call_args[0][0]
assert "--depth" in call_args
assert "5" in call_args
def test_git_checkout_with_pushurl():
"""Test git_checkout with pushurl."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test-pushurl",
"pushurl": "[email protected]:test/repo.git",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("", "")
with patch.object(wc, "run_git", return_value=mock_process):
with patch.object(wc, "git_set_pushurl", return_value=("", "")) as mock_pushurl:
wc.git_checkout(submodules="never")
# Verify git_set_pushurl was called
mock_pushurl.assert_called_once()
def test_git_set_pushurl_failure():
"""Test git_set_pushurl handles failure."""
from mxdev.vcs.git import GitError
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
"pushurl": "[email protected]:test/repo.git",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 1
mock_process.communicate.return_value = ("", "config failed")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(GitError, match="git config"):
wc.git_set_pushurl("", "")
def test_git_init_submodules_failure():
"""Test git_init_submodules handles failure."""
from mxdev.vcs.git import GitError
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 1
mock_process.communicate.return_value = ("", "submodule init failed")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(GitError, match="git submodule init"):
wc.git_init_submodules("", "")
def test_git_init_submodules_stderr_output():
"""Test git_init_submodules parses stderr when stdout is empty."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = (
"",
"Submodule 'vendor/libs' (https://github.com/vendor/libs.git) registered",
)
with patch.object(wc, "run_git", return_value=mock_process):
stdout, stderr, initialized = wc.git_init_submodules("", "")
assert "vendor/libs" in initialized
def test_git_update_submodules_failure():
"""Test git_update_submodules handles failure."""
from mxdev.vcs.git import GitError
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 1
mock_process.communicate.return_value = ("", "submodule update failed")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(GitError, match="git submodule update"):
wc.git_update_submodules("", "")
def test_git_update_submodules_recursive():
"""Test git_update_submodules with recursive flag."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("updated", "")
with patch.object(wc, "run_git", return_value=mock_process) as mock_run:
wc.git_update_submodules("", "", recursive=True)
# Verify recursive flags were included
call_args = mock_run.call_args[0][0]
assert "--init" in call_args
assert "--recursive" in call_args
def test_git_update_submodules_specific():
"""Test git_update_submodules for a specific submodule."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("updated", "")
with patch.object(wc, "run_git", return_value=mock_process) as mock_run:
wc.git_update_submodules("", "", submodule="vendor/libs")
# Verify specific submodule was included
call_args = mock_run.call_args[0][0]
assert "vendor/libs" in call_args
def test_checkout_path_not_exist():
"""Test checkout when path doesn't exist."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/nonexistent/test",
}
wc = GitWorkingCopy(source)
with patch.object(wc, "git_checkout", return_value="checkout output") as mock_checkout:
result = wc.checkout(submodules="never")
# Should call git_checkout
mock_checkout.assert_called_once()
assert result == "checkout output"
def test_checkout_update_needed():
"""Test checkout when update is needed."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
with patch("os.path.exists", return_value=True):
with patch.object(wc, "should_update", return_value=True):
with patch.object(wc, "update", return_value="update output") as mock_update:
result = wc.checkout()
mock_update.assert_called_once()
assert result == "update output"
def test_checkout_no_update_doesnt_match():
"""Test checkout when no update and doesn't match."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
with patch("os.path.exists", return_value=True):
with patch.object(wc, "should_update", return_value=False):
with patch.object(wc, "matches", return_value=False):
result = wc.checkout()
# Should return None and log warning
assert result is None
def test_matches_failure():
"""Test matches() handles git remote failure."""
from mxdev.vcs.git import GitError
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 1
mock_process.communicate.return_value = ("", "remote show failed")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(GitError, match="git remote"):
wc.matches()
def test_update_not_matching():
"""Test update when URL doesn't match."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
with patch.object(wc, "matches", return_value=False):
with patch.object(wc, "status", return_value="clean"):
with patch.object(wc, "git_update", return_value="updated") as mock_git_update:
result = wc.update()
# Should still call git_update even if not matching
mock_git_update.assert_called_once()
def test_update_dirty_no_force():
"""Test update with dirty status and no force."""
from mxdev.vcs.git import GitError
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
with patch.object(wc, "matches", return_value=True):
with patch.object(wc, "status", return_value="dirty"):
with pytest.raises(GitError, match="dirty"):
wc.update()
def test_update_dirty_with_force():
"""Test update with dirty status and force=True."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
with patch.object(wc, "matches", return_value=True):
with patch.object(wc, "status", return_value="dirty"):
with patch.object(wc, "git_update", return_value="updated") as mock_git_update:
result = wc.update(force=True)
# Should call git_update when forced
mock_git_update.assert_called_once()
def test_git_update_fetch_failure():
"""Test git_update handles fetch failure."""
from mxdev.vcs.git import GitError
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 1
mock_process.communicate.return_value = ("", "fetch failed")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(GitError, match="git fetch"):
wc.git_update(submodules="never")
def test_status_clean():
"""Test status() returns clean."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("## main...origin/main", "")
with patch.object(wc, "run_git", return_value=mock_process):
status = wc.status()
assert status == "clean"
def test_status_ahead():
"""Test status() returns ahead."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("## main...origin/main [ahead 2]", "")
with patch.object(wc, "run_git", return_value=mock_process):
status = wc.status()
assert status == "ahead"
def test_status_dirty():
"""Test status() returns dirty."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("## main\n M file.txt", "")
with patch.object(wc, "run_git", return_value=mock_process):
status = wc.status()
assert status == "dirty"
def test_status_verbose():
"""Test status() with verbose=True."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
output = "## main\n M file.txt"
mock_process.communicate.return_value = (output, "")
with patch.object(wc, "run_git", return_value=mock_process):
status, stdout = wc.status(verbose=True)
assert status == "dirty"
assert stdout == output
def test_git_switch_branch_failure():
"""Test git_switch_branch handles branch -a failure."""
from mxdev.vcs.git import GitError
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 1
mock_process.communicate.return_value = ("", "branch command failed")
with patch.object(wc, "run_git", return_value=mock_process):
with patch.object(wc, "git_version", return_value=(2, 30, 0)):
with pytest.raises(GitError, match="git branch -a"):
wc.git_switch_branch("", "")
def test_git_switch_branch_missing_no_accept():
"""Test git_switch_branch with missing branch and accept_missing=False."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
"branch": "nonexistent",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("* main\n", "")
with patch.object(wc, "run_git", return_value=mock_process):
with pytest.raises(SystemExit):
wc.git_switch_branch("", "", accept_missing=False)
def test_git_switch_branch_missing_accept():
"""Test git_switch_branch with missing branch and accept_missing=True."""
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
"branch": "nonexistent",
}
wc = GitWorkingCopy(source)
mock_process = Mock()
mock_process.returncode = 0
mock_process.communicate.return_value = ("* main\n", "")
with patch.object(wc, "run_git", return_value=mock_process):
with patch.object(wc, "git_version", return_value=(2, 30, 0)):
stdout, stderr = wc.git_switch_branch("", "", accept_missing=True)
# Should return without error
assert "main" in stdout
def test_git_switch_branch_checkout_failure():
"""Test git_switch_branch handles checkout failure."""
from mxdev.vcs.git import GitError
from mxdev.vcs.git import GitWorkingCopy
with patch("mxdev.vcs.common.which", return_value="/usr/bin/git"):
source = {
"name": "test-package",
"url": "https://github.com/test/repo.git",
"path": "/tmp/test",
"branch": "develop",
}
wc = GitWorkingCopy(source)
def mock_run_git_side_effect(commands, **kwargs):
mock_proc = Mock()
if "branch" in commands:
mock_proc.returncode = 0
mock_proc.communicate.return_value = ("* main\n develop\n", "")
else: # checkout command
mock_proc.returncode = 1
mock_proc.communicate.return_value = ("", "checkout failed")
return mock_proc
with patch.object(wc, "run_git", side_effect=mock_run_git_side_effect):
with patch.object(wc, "git_version", return_value=(2, 30, 0)):
with pytest.raises(GitError, match="git checkout"):
wc.git_switch_branch("", "")
def test_smart_threading_separates_https_with_pushurl():
"""Test smart threading correctly separates HTTPS packages based on pushurl.
HTTPS URLs with pushurl should go to parallel queue (other_packages).
HTTPS URLs without pushurl should go to serial queue (https_packages).
"""
from mxdev.vcs.common import WorkingCopies
sources = {
"https-no-pushurl": {
"name": "https-no-pushurl",
"url": "https://github.com/org/repo1.git",
"path": "/tmp/repo1",
},
"https-with-pushurl": {
"name": "https-with-pushurl",
"url": "https://github.com/org/repo2.git",
"path": "/tmp/repo2",
"pushurl": "[email protected]:org/repo2.git",
},
"ssh-url": {
"name": "ssh-url",
"url": "[email protected]:org/repo3.git",
"path": "/tmp/repo3",
},
"fs-url": {
"name": "fs-url",
"url": "/local/path/repo4",
"path": "/tmp/repo4",
},
}
wc = WorkingCopies(sources=sources, threads=4, smart_threading=True)