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
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
|
# Copyright 2009 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
"""Tests for BranchJobs."""
__metaclass__ = type
import datetime
import os
import shutil
import tempfile
from unittest import TestLoader
from bzrlib import errors as bzr_errors
from bzrlib.branch import (
Branch,
BzrBranchFormat7,
)
from bzrlib.bzrdir import BzrDirMetaFormat1
from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack6
from bzrlib.revision import NULL_REVISION
from bzrlib.transport import get_transport
import pytz
from sqlobject import SQLObjectNotFound
from storm.locals import Store
import transaction
from zope.component import getUtility
from zope.security.proxy import removeSecurityProxy
from canonical.config import config
from canonical.database.constants import UTC_NOW
from canonical.launchpad.interfaces.emailaddress import EmailAddressStatus
from canonical.launchpad.interfaces.lpstorm import IMasterStore
from canonical.launchpad.testing.librarianhelpers import (
get_newest_librarian_file,
)
from canonical.launchpad.webapp import canonical_url
from canonical.launchpad.webapp.testing import verifyObject
from canonical.testing.layers import (
DatabaseFunctionalLayer,
LaunchpadZopelessLayer,
)
from lp.code.bzr import (
BranchFormat,
RepositoryFormat,
)
from lp.code.enums import (
BranchMergeProposalStatus,
BranchSubscriptionDiffSize,
BranchSubscriptionNotificationLevel,
CodeReviewNotificationLevel,
)
from lp.code.interfaces.branchjob import (
IBranchDiffJob,
IBranchJob,
IBranchScanJob,
IBranchUpgradeJob,
IReclaimBranchSpaceJob,
IReclaimBranchSpaceJobSource,
IRevisionMailJob,
IRosettaUploadJob,
)
from lp.code.model.branchjob import (
BranchDiffJob,
BranchJob,
BranchJobDerived,
BranchJobType,
BranchScanJob,
BranchUpgradeJob,
ReclaimBranchSpaceJob,
RevisionMailJob,
RevisionsAddedJob,
RosettaUploadJob,
)
from lp.code.model.branchrevision import BranchRevision
from lp.code.model.revision import RevisionSet
from lp.codehosting.vfs import branch_id_to_path
from lp.scripts.helpers import TransactionFreeOperation
from lp.services.job.interfaces.job import JobStatus
from lp.services.job.model.job import Job
from lp.services.osutils import override_environ
from lp.testing import TestCaseWithFactory
from lp.testing.mail_helpers import pop_notifications
from lp.translations.enums import RosettaImportStatus
from lp.translations.interfaces.translationimportqueue import (
ITranslationImportQueue,
)
from lp.translations.interfaces.translations import (
TranslationsBranchImportMode,
)
class TestBranchJob(TestCaseWithFactory):
"""Tests for BranchJob."""
layer = DatabaseFunctionalLayer
def test_providesInterface(self):
"""Ensure that BranchJob implements IBranchJob."""
branch = self.factory.makeAnyBranch()
verifyObject(
IBranchJob, BranchJob(branch, BranchJobType.STATIC_DIFF, {}))
def test_destroySelf_destroys_job(self):
"""Ensure that BranchJob.destroySelf destroys the Job as well."""
branch = self.factory.makeAnyBranch()
branch_job = BranchJob(branch, BranchJobType.STATIC_DIFF, {})
job_id = branch_job.job.id
branch_job.destroySelf()
self.assertRaises(SQLObjectNotFound, BranchJob.get, job_id)
class TestBranchJobDerived(TestCaseWithFactory):
layer = LaunchpadZopelessLayer
def test_getOopsMailController(self):
"""By default, no mail is sent about failed BranchJobs."""
branch = self.factory.makeAnyBranch()
job = BranchJob(branch, BranchJobType.STATIC_DIFF, {})
derived = BranchJobDerived(job)
self.assertIs(None, derived.getOopsMailController('x'))
class TestBranchDiffJob(TestCaseWithFactory):
"""Tests for BranchDiffJob."""
layer = LaunchpadZopelessLayer
def test_providesInterface(self):
"""Ensure that BranchDiffJob implements IBranchDiffJob."""
verifyObject(
IBranchDiffJob, BranchDiffJob.create(1, '0', '1'))
def test_run_revision_ids(self):
"""Ensure that run calculates revision ids."""
self.useBzrBranches(direct_database=True)
branch, tree = self.create_branch_and_tree()
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
tree.commit('First commit', rev_id='rev1')
job = BranchDiffJob.create(branch, '0', '1')
static_diff = job.run()
self.assertEqual('null:', static_diff.from_revision_id)
self.assertEqual('rev1', static_diff.to_revision_id)
def test_run_diff_content(self):
"""Ensure that run generates expected diff."""
self.useBzrBranches(direct_database=True)
tree_location = tempfile.mkdtemp()
self.addCleanup(lambda: shutil.rmtree(tree_location))
branch, tree = self.create_branch_and_tree(
tree_location=tree_location)
tree_file = os.path.join(tree_location, 'file')
open(tree_file, 'wb').write('foo\n')
tree.add('file')
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
tree.commit('First commit')
open(tree_file, 'wb').write('bar\n')
tree.commit('Next commit')
job = BranchDiffJob.create(branch, '1', '2')
static_diff = job.run()
transaction.commit()
content_lines = static_diff.diff.text.splitlines()
self.assertEqual(
content_lines[3:], ['@@ -1,1 +1,1 @@', '-foo', '+bar', ''],
content_lines[3:])
self.assertEqual(7, len(content_lines))
def test_run_is_idempotent(self):
"""Ensure running an equivalent job emits the same diff."""
self.useBzrBranches(direct_database=True)
branch, tree = self.create_branch_and_tree()
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
tree.commit('First commit')
job1 = BranchDiffJob.create(branch, '0', '1')
static_diff1 = job1.run()
job2 = BranchDiffJob.create(branch, '0', '1')
static_diff2 = job2.run()
self.assertTrue(static_diff1 is static_diff2)
def create_rev1_diff(self):
"""Create a StaticDiff for use by test methods.
This diff contains an add of a file called hello.txt, with contents
"Hello World\n".
"""
self.useBzrBranches(direct_database=True)
branch, tree = self.create_branch_and_tree()
tree_transport = tree.bzrdir.root_transport
tree_transport.put_bytes("hello.txt", "Hello World\n")
tree.add('hello.txt')
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
tree.commit('rev1', timestamp=1e9, timezone=0)
job = BranchDiffJob.create(branch, '0', '1')
diff = job.run()
transaction.commit()
return diff
def test_diff_contents(self):
"""Ensure the diff contents match expectations."""
diff = self.create_rev1_diff()
expected = (
"=== added file 'hello.txt'" '\n'
"--- hello.txt" '\t' "1970-01-01 00:00:00 +0000" '\n'
"+++ hello.txt" '\t' "2001-09-09 01:46:40 +0000" '\n'
"@@ -0,0 +1,1 @@" '\n'
"+Hello World" '\n'
'\n')
self.assertEqual(diff.diff.text, expected)
def test_diff_is_bytes(self):
"""Diffs should be bytestrings.
Diffs have no single encoding, because they may encompass files in
multiple encodings. Therefore, we consider them binary, to avoid
lossy decoding.
"""
diff = self.create_rev1_diff()
self.assertIsInstance(diff.diff.text, str)
class TestBranchScanJob(TestCaseWithFactory):
"""Tests for `BranchScanJob`."""
layer = LaunchpadZopelessLayer
def test_providesInterface(self):
"""Ensure that BranchScanJob implements IBranchScanJob."""
branch = self.factory.makeAnyBranch()
job = BranchScanJob.create(branch)
verifyObject(IBranchScanJob, job)
def test_run(self):
"""Ensure the job scans the branch."""
self.useBzrBranches(direct_database=True)
db_branch, bzr_tree = self.create_branch_and_tree()
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
bzr_tree.commit('First commit', rev_id='rev1')
bzr_tree.commit('Second commit', rev_id='rev2')
bzr_tree.commit('Third commit', rev_id='rev3')
LaunchpadZopelessLayer.commit()
job = BranchScanJob.create(db_branch)
LaunchpadZopelessLayer.switchDbUser(config.branchscanner.dbuser)
job.run()
LaunchpadZopelessLayer.switchDbUser(config.launchpad.dbuser)
self.assertEqual(db_branch.revision_count, 3)
bzr_tree.commit('Fourth commit', rev_id='rev4')
bzr_tree.commit('Fifth commit', rev_id='rev5')
job = BranchScanJob.create(db_branch)
LaunchpadZopelessLayer.switchDbUser(config.branchscanner.dbuser)
job.run()
self.assertEqual(db_branch.revision_count, 5)
class TestBranchUpgradeJob(TestCaseWithFactory):
"""Tests for `BranchUpgradeJob`."""
layer = LaunchpadZopelessLayer
def make_format(self, branch_format=None, repo_format=None):
# Return a Bzr MetaDir format with the provided branch and repository
# formats.
if branch_format is None:
branch_format = BzrBranchFormat7
if repo_format is None:
repo_format = RepositoryFormatKnitPack6
format = BzrDirMetaFormat1()
format.set_branch_format(branch_format())
format._set_repository_format(repo_format())
return format
def test_providesInterface(self):
"""Ensure that BranchUpgradeJob implements IBranchUpgradeJob."""
branch = self.factory.makeAnyBranch(
branch_format=BranchFormat.BZR_BRANCH_5,
repository_format=RepositoryFormat.BZR_REPOSITORY_4)
job = BranchUpgradeJob.create(branch)
verifyObject(IBranchUpgradeJob, job)
def test_upgrades_branch(self):
"""Ensure that a branch with an outdated format is upgraded."""
self.useBzrBranches(direct_database=True)
db_branch, tree = self.create_branch_and_tree(format='knit')
db_branch.branch_format = BranchFormat.BZR_BRANCH_5
db_branch.repository_format = RepositoryFormat.BZR_KNIT_1
self.assertEqual(
tree.branch.repository._format.get_format_string(),
'Bazaar-NG Knit Repository Format 1')
job = BranchUpgradeJob.create(db_branch)
self.becomeDbUser(config.upgrade_branches.dbuser)
with TransactionFreeOperation.require():
job.run()
new_branch = Branch.open(tree.branch.base)
self.assertEqual(
new_branch.repository._format.get_format_string(),
'Bazaar repository format 2a (needs bzr 1.16 or later)\n')
self.assertFalse(db_branch.needs_upgrading)
def test_needs_no_upgrading(self):
# Branch upgrade job creation should raise an AssertionError if the
# branch does not need to be upgraded.
branch = self.factory.makeAnyBranch(
branch_format=BranchFormat.BZR_BRANCH_7,
repository_format=RepositoryFormat.BZR_CHK_2A)
self.assertRaises(AssertionError, BranchUpgradeJob.create, branch)
def test_existing_bzr_backup(self):
# If the target branch already has a backup.bzr dir, the upgrade copy
# should remove it.
self.useBzrBranches(direct_database=True)
db_branch, tree = self.create_branch_and_tree(format='knit')
db_branch.branch_format = BranchFormat.BZR_BRANCH_5
db_branch.repository_format = RepositoryFormat.BZR_KNIT_1
# Add a fake backup.bzr dir
source_branch_transport = get_transport(db_branch.getInternalBzrUrl())
source_branch_transport.mkdir('backup.bzr')
source_branch_transport.clone('.bzr').copy_tree_to_transport(
source_branch_transport.clone('backup.bzr'))
job = BranchUpgradeJob.create(db_branch)
self.becomeDbUser(config.upgrade_branches.dbuser)
job.run()
new_branch = Branch.open(tree.branch.base)
self.assertEqual(
new_branch.repository._format.get_format_string(),
'Bazaar repository format 2a (needs bzr 1.16 or later)\n')
def test_db_user_can_request_scan(self):
# The database user that does the upgrade needs to be able to request
# a scan of the branch.
branch = self.factory.makeAnyBranch()
self.becomeDbUser(config.upgrade_branches.dbuser)
# Scan jobs are created by the branchChanged method.
branch.branchChanged('', 'new-id', None, None, None)
Store.of(branch).flush()
class TestRevisionMailJob(TestCaseWithFactory):
"""Tests for BranchDiffJob."""
layer = LaunchpadZopelessLayer
def test_providesInterface(self):
"""Ensure that RevisionMailJob implements IRevisionMailJob."""
branch = self.factory.makeAnyBranch()
job = RevisionMailJob.create(
branch, 0, 'from@example.com', 'hello', False, 'subject')
verifyObject(IRevisionMailJob, job)
def test_repr(self):
"""Ensure that the revision mail job as a reasonable repr."""
branch = self.factory.makeAnyBranch()
job = RevisionMailJob.create(
branch, 0, 'from@example.com', 'hello', False, 'subject')
self.assertEqual(
'<REVISION_MAIL branch job (%s) for %s>'
% (job.context.id, branch.unique_name),
repr(job))
def test_run_sends_mail(self):
"""Ensure RevisionMailJob.run sends mail with correct values."""
branch = self.factory.makeAnyBranch()
branch.subscribe(
branch.registrant,
BranchSubscriptionNotificationLevel.FULL,
BranchSubscriptionDiffSize.WHOLEDIFF,
CodeReviewNotificationLevel.FULL,
branch.registrant)
job = RevisionMailJob.create(
branch, 0, 'from@example.com', 'hello', False, 'subject')
job.run()
(mail, ) = pop_notifications()
self.assertEqual('0', mail['X-Launchpad-Branch-Revision-Number'])
self.assertEqual('from@example.com', mail['from'])
self.assertEqual('subject', mail['subject'])
self.assertEqual(
'hello\n'
'\n--\n'
'%(identity)s\n'
'%(url)s\n'
'\nYou are subscribed to branch %(identity)s.\n'
'To unsubscribe from this branch go to'
' %(url)s/+edit-subscription\n' % {
'url': canonical_url(branch),
'identity': branch.bzr_identity,
},
mail.get_payload(decode=True))
def test_revno_string(self):
"""Ensure that revnos can be strings."""
branch = self.factory.makeAnyBranch()
job = RevisionMailJob.create(
branch, 'removed', 'from@example.com', 'hello', False, 'subject')
self.assertEqual('removed', job.revno)
def test_revno_long(self):
"Ensure that the revno is a long, not an int."
branch = self.factory.makeAnyBranch()
job = RevisionMailJob.create(
branch, 1, 'from@example.com', 'hello', False, 'subject')
self.assertIsInstance(job.revno, long)
def test_perform_diff_performs_diff(self):
"""Ensure that a diff is generated when perform_diff is True."""
self.useBzrBranches(direct_database=True)
branch, tree = self.create_branch_and_tree()
tree.bzrdir.root_transport.put_bytes('foo', 'bar\n')
tree.add('foo')
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
tree.commit('First commit')
job = RevisionMailJob.create(
branch, 1, 'from@example.com', 'hello', True, 'subject')
mailer = job.getMailer()
self.assertIn('+bar\n', mailer.diff)
def test_perform_diff_ignored_for_revno_0(self):
"""For the null revision, no diff is generated."""
self.useBzrBranches(direct_database=True)
branch, tree = self.create_branch_and_tree()
job = RevisionMailJob.create(
branch, 0, 'from@example.com', 'hello', True, 'subject')
self.assertIs(None, job.from_revision_spec)
self.assertIs(None, job.to_revision_spec)
mailer = job.getMailer()
self.assertIs(None, mailer.diff)
def test_iterReady_ignores_BranchDiffJobs(self):
"""Only BranchDiffJobs should not be listed."""
branch = self.factory.makeAnyBranch()
BranchDiffJob.create(branch, 0, 1)
self.assertEqual([], list(RevisionMailJob.iterReady()))
def test_iterReady_includes_ready_jobs(self):
"""Ready jobs should be listed."""
branch = self.factory.makeAnyBranch()
job = RevisionMailJob.create(
branch, 0, 'from@example.org', 'body', False, 'subject')
job.job.sync()
job.context.sync()
self.assertEqual([job], list(RevisionMailJob.iterReady()))
def test_iterReady_excludes_unready_jobs(self):
"""Unready jobs should not be listed."""
branch = self.factory.makeAnyBranch()
job = RevisionMailJob.create(
branch, 0, 'from@example.org', 'body', False, 'subject')
job.job.start()
job.job.complete()
self.assertEqual([], list(RevisionMailJob.iterReady()))
class TestRevisionsAddedJob(TestCaseWithFactory):
"""Tests for RevisionsAddedJob."""
layer = LaunchpadZopelessLayer
def test_create(self):
"""RevisionsAddedJob.create uses the correct values."""
branch = self.factory.makeBranch()
job = RevisionsAddedJob.create(branch, 'rev1', 'rev2', '')
self.assertEqual('rev1', job.last_scanned_id)
self.assertEqual('rev2', job.last_revision_id)
self.assertEqual(branch, job.branch)
self.assertEqual(
BranchJobType.REVISIONS_ADDED_MAIL, job.context.job_type)
def test_iterReady(self):
"""IterReady iterates through ready jobs."""
branch = self.factory.makeBranch()
job = RevisionsAddedJob.create(branch, 'rev1', 'rev2', '')
self.assertEqual([job], list(RevisionsAddedJob.iterReady()))
def updateDBRevisions(self, branch, bzr_branch, revision_ids=None):
"""Update the database for the revisions.
:param branch: The database branch associated with the revisions.
:param bzr_branch: The Bazaar branch associated with the revisions.
:param revision_ids: The ids of the revisions to update. If not
supplied, the branch revision history is used.
"""
if revision_ids is None:
revision_ids = bzr_branch.revision_history()
for bzr_revision in bzr_branch.repository.get_revisions(revision_ids):
existing = branch.getBranchRevision(
revision_id=bzr_revision.revision_id)
if existing is None:
revision = RevisionSet().newFromBazaarRevision(bzr_revision)
else:
revision = RevisionSet().getByRevisionId(
bzr_revision.revision_id)
try:
revno = bzr_branch.revision_id_to_revno(revision.revision_id)
except bzr_errors.NoSuchRevision:
revno = None
if existing is not None:
branchrevision = IMasterStore(branch).find(
BranchRevision,
BranchRevision.branch_id == branch.id,
BranchRevision.revision_id == revision.id)
branchrevision.remove()
branch.createBranchRevision(revno, revision)
def create3CommitsBranch(self):
"""Create a branch with three commits."""
branch, tree = self.create_branch_and_tree()
tree.lock_write()
try:
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
tree.commit('rev1', rev_id='rev1')
tree.commit('rev2', rev_id='rev2')
tree.commit('rev3', rev_id='rev3')
transaction.commit()
self.layer.switchDbUser('branchscanner')
self.updateDBRevisions(
branch, tree.branch, ['rev1', 'rev2', 'rev3'])
finally:
tree.unlock()
return branch, tree
def test_iterAddedMainline(self):
"""iterAddedMainline iterates through mainline revisions."""
self.useBzrBranches(direct_database=True)
branch, tree = self.create3CommitsBranch()
job = RevisionsAddedJob.create(branch, 'rev1', 'rev2', '')
job.bzr_branch.lock_read()
self.addCleanup(job.bzr_branch.unlock)
[(revision, revno)] = list(job.iterAddedMainline())
self.assertEqual(2, revno)
def test_iterAddedNonMainline(self):
"""iterAddedMainline drops non-mainline revisions."""
self.useBzrBranches(direct_database=True)
branch, tree = self.create3CommitsBranch()
tree.pull(tree.branch, overwrite=True, stop_revision='rev2')
tree.add_parent_tree_id('rev3')
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
tree.commit('rev3a', rev_id='rev3a')
self.updateDBRevisions(branch, tree.branch, ['rev3', 'rev3a'])
job = RevisionsAddedJob.create(branch, 'rev1', 'rev3', '')
job.bzr_branch.lock_read()
self.addCleanup(job.bzr_branch.unlock)
out = [x.revision_id for x, y in job.iterAddedMainline()]
self.assertEqual(['rev2'], out)
def test_iterAddedMainline_order(self):
"""iterAddedMainline iterates in commit order."""
self.useBzrBranches(direct_database=True)
branch, tree = self.create3CommitsBranch()
job = RevisionsAddedJob.create(branch, 'rev1', 'rev3', '')
job.bzr_branch.lock_read()
self.addCleanup(job.bzr_branch.unlock)
# Since we've gone from rev1 to rev3, we've added rev2 and rev3.
[(rev2, revno2), (rev3, revno3)] = list(job.iterAddedMainline())
self.assertEqual('rev2', rev2.revision_id)
self.assertEqual(2, revno2)
self.assertEqual('rev3', rev3.revision_id)
self.assertEqual(3, revno3)
def makeBranchWithCommit(self):
"""Create a branch with a commit."""
jrandom = self.factory.makePerson(name='jrandom')
product = self.factory.makeProduct(name='foo')
branch = self.factory.makeProductBranch(
name='bar', product=product, owner=jrandom)
branch.subscribe(
branch.registrant,
BranchSubscriptionNotificationLevel.FULL,
BranchSubscriptionDiffSize.WHOLEDIFF,
CodeReviewNotificationLevel.FULL,
branch.registrant)
branch, tree = self.create_branch_and_tree(db_branch=branch)
tree.branch.nick = 'nicholas'
tree.lock_write()
self.addCleanup(tree.unlock)
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
tree.commit(
'rev1', rev_id='rev1', timestamp=1000, timezone=0,
committer='J. Random Hacker <jrandom@example.org>')
return branch, tree
def makeRevisionsAddedWithMergeCommit(self, authors=None,
include_ghost=False):
"""Create a RevisionsAdded job with a revision that is a merge.
:param authors: If specified, the list of authors of the commit
that merges the others.
:param include_ghost:If true, add revision 2c as a ghost revision.
"""
self.useBzrBranches(direct_database=True)
branch, tree = self.create_branch_and_tree()
tree.branch.nick = 'nicholas'
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
tree.commit('rev1')
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
tree2.commit('rev2a', rev_id='rev2a-id', committer='foo@')
tree2.commit('rev3', rev_id='rev3-id',
authors=['bar@', 'baz@blaine.com'])
tree.merge_from_branch(tree2.branch)
tree3 = tree.bzrdir.sprout('tree3').open_workingtree()
tree3.commit('rev2b', rev_id='rev2b-id', committer='qux@')
tree.merge_from_branch(tree3.branch, force=True)
if include_ghost:
tree.add_parent_tree_id('rev2c-id')
tree.commit('rev2d', rev_id='rev2d-id', timestamp=1000,
timezone=0, authors=authors,
committer='J. Random Hacker <jrandom@example.org>')
return RevisionsAddedJob.create(branch, 'rev2d-id', 'rev2d-id', '')
def test_getMergedRevisionIDs(self):
"""Ensure the correct revision ids are returned for a merge."""
job = self.makeRevisionsAddedWithMergeCommit(include_ghost=True)
job.bzr_branch.lock_write()
graph = job.bzr_branch.repository.get_graph()
self.addCleanup(job.bzr_branch.unlock)
self.assertEqual(set(['rev2a-id', 'rev3-id', 'rev2b-id', 'rev2c-id']),
job.getMergedRevisionIDs('rev2d-id', graph))
def test_findRelatedBMP(self):
"""The related branch merge proposals can be identified."""
self.useBzrBranches(direct_database=True)
target_branch, tree = self.create_branch_and_tree('tree')
desired_proposal = self.factory.makeBranchMergeProposal(
target_branch=target_branch)
desired_proposal.source_branch.last_scanned_id = 'rev2a-id'
wrong_revision_proposal = self.factory.makeBranchMergeProposal(
target_branch=target_branch)
wrong_revision_proposal.source_branch.last_scanned_id = 'rev3-id'
wrong_target_proposal = self.factory.makeBranchMergeProposal()
wrong_target_proposal.source_branch.last_scanned_id = 'rev2a-id'
job = RevisionsAddedJob.create(target_branch, 'rev2b-id', 'rev2b-id',
'')
self.assertEqual(
[desired_proposal], job.findRelatedBMP(['rev2a-id']))
def test_findRelatedBMP_one_per_source(self):
"""findRelatedBMP only returns the most recent proposal for any
particular source branch.
"""
self.useBzrBranches(direct_database=True)
target_branch, tree = self.create_branch_and_tree('tree')
the_past = datetime.datetime(2009, 1, 1, tzinfo=pytz.UTC)
old_proposal = self.factory.makeBranchMergeProposal(
target_branch=target_branch, date_created=the_past,
set_state=BranchMergeProposalStatus.MERGED)
source_branch = old_proposal.source_branch
source_branch.last_scanned_id = 'rev2a-id'
desired_proposal = source_branch.addLandingTarget(
source_branch.owner, target_branch)
job = RevisionsAddedJob.create(
target_branch, 'rev2b-id', 'rev2b-id', '')
self.assertEqual(
[desired_proposal], job.findRelatedBMP(['rev2a-id']))
def test_getAuthors(self):
"""Ensure getAuthors returns the authors for the revisions."""
job = self.makeRevisionsAddedWithMergeCommit()
job.bzr_branch.lock_write()
self.addCleanup(job.bzr_branch.unlock)
graph = job.bzr_branch.repository.get_graph()
revision_ids = ['rev2a-id', 'rev3-id', 'rev2b-id']
self.assertEqual(set(['foo@', 'bar@', 'baz@blaine.com', 'qux@']),
job.getAuthors(revision_ids, graph))
def test_getAuthors_with_ghost(self):
"""getAuthors ignores ghosts when returning the authors."""
job = self.makeRevisionsAddedWithMergeCommit(include_ghost=True)
job.bzr_branch.lock_write()
graph = job.bzr_branch.repository.get_graph()
self.addCleanup(job.bzr_branch.unlock)
revision_ids = ['rev2a-id', 'rev3-id', 'rev2b-id', 'rev2c-id']
self.assertEqual(set(['foo@', 'bar@', 'baz@blaine.com', 'qux@']),
job.getAuthors(revision_ids, graph))
def test_getRevisionMessage(self):
"""getRevisionMessage provides a correctly-formatted message."""
self.useBzrBranches(direct_database=True)
branch, tree = self.makeBranchWithCommit()
job = RevisionsAddedJob.create(branch, 'rev1', 'rev1', '')
message = job.getRevisionMessage('rev1', 1)
self.assertEqual(
'------------------------------------------------------------\n'
'revno: 1\n'
'committer: J. Random Hacker <jrandom@example.org>\n'
'branch nick: nicholas\n'
'timestamp: Thu 1970-01-01 00:16:40 +0000\n'
'message:\n'
' rev1\n', message)
def test_getRevisionMessage_with_merge_authors(self):
"""Merge authors are included after the main bzr log."""
self.factory.makePerson(name='baz',
displayname='Basil Blaine',
email='baz@blaine.com',
email_address_status=EmailAddressStatus.VALIDATED)
job = self.makeRevisionsAddedWithMergeCommit()
message = job.getRevisionMessage('rev2d-id', 1)
self.assertEqual(
u'Merge authors:\n'
' bar@\n'
' Basil Blaine (baz)\n'
' foo@\n'
' qux@\n'
'------------------------------------------------------------\n'
'revno: 2 [merge]\n'
'committer: J. Random Hacker <jrandom@example.org>\n'
'branch nick: nicholas\n'
'timestamp: Thu 1970-01-01 00:16:40 +0000\n'
'message:\n'
' rev2d\n', message)
def test_getRevisionMessage_with_merge_authors_and_authors(self):
"""Merge authors are separate from normal authors."""
job = self.makeRevisionsAddedWithMergeCommit(authors=['quxx'])
message = job.getRevisionMessage('rev2d-id', 1)
self.assertEqual(
'Merge authors:\n'
' bar@\n'
' baz@blaine.com\n'
' foo@\n'
' qux@\n'
'------------------------------------------------------------\n'
'revno: 2 [merge]\n'
'author: quxx\n'
'committer: J. Random Hacker <jrandom@example.org>\n'
'branch nick: nicholas\n'
'timestamp: Thu 1970-01-01 00:16:40 +0000\n'
'message:\n'
' rev2d\n', message)
def makeJobAndBMP(self):
job = self.makeRevisionsAddedWithMergeCommit()
hacker = self.factory.makePerson(displayname='J. Random Hacker',
name='jrandom')
bmp = self.factory.makeBranchMergeProposal(target_branch=job.branch,
registrant=hacker)
bmp.source_branch.last_scanned_id = 'rev3-id'
return job, bmp
def test_getRevisionMessage_with_related_BMP(self):
"""Information about related proposals is displayed."""
job, bmp = self.makeJobAndBMP()
transaction.commit()
self.layer.switchDbUser(config.sendbranchmail.dbuser)
message = job.getRevisionMessage('rev2d-id', 1)
self.assertEqual(
'Merge authors:\n'
' bar@\n'
' baz@blaine.com\n'
' foo@\n'
' qux@\n'
'Related merge proposals:\n'
' %s\n'
' proposed by: J. Random Hacker (jrandom)\n'
'------------------------------------------------------------\n'
'revno: 2 [merge]\n'
'committer: J. Random Hacker <jrandom@example.org>\n'
'branch nick: nicholas\n'
'timestamp: Thu 1970-01-01 00:16:40 +0000\n'
'message:\n'
' rev2d\n' % canonical_url(bmp), message)
def test_getRevisionMessage_with_related_superseded_BMP(self):
"""Superseded proposals are skipped."""
job, bmp = self.makeJobAndBMP()
bmp2 = bmp.resubmit(bmp.registrant)
transaction.commit()
self.layer.switchDbUser(config.sendbranchmail.dbuser)
message = job.getRevisionMessage('rev2d-id', 1)
self.assertEqual(
'Merge authors:\n'
' bar@\n'
' baz@blaine.com\n'
' foo@\n'
' qux@\n'
'Related merge proposals:\n'
' %s\n'
' proposed by: J. Random Hacker (jrandom)\n'
'------------------------------------------------------------\n'
'revno: 2 [merge]\n'
'committer: J. Random Hacker <jrandom@example.org>\n'
'branch nick: nicholas\n'
'timestamp: Thu 1970-01-01 00:16:40 +0000\n'
'message:\n'
' rev2d\n' % canonical_url(bmp2), message)
def test_getRevisionMessage_with_BMP_with_requested_review(self):
"""Information about incomplete reviews is omitted.
If there is a related branch merge proposal, and it has
requested reviews which have not been completed, they are ignored.
"""
job, bmp = self.makeJobAndBMP()
reviewer = self.factory.makePerson()
bmp.nominateReviewer(reviewer, bmp.registrant)
transaction.commit()
self.layer.switchDbUser(config.sendbranchmail.dbuser)
message = job.getRevisionMessage('rev2d-id', 1)
self.assertEqual(
'Merge authors:\n'
' bar@\n'
' baz@blaine.com\n'
' foo@\n'
' qux@\n'
'Related merge proposals:\n'
' %s\n'
' proposed by: J. Random Hacker (jrandom)\n'
'------------------------------------------------------------\n'
'revno: 2 [merge]\n'
'committer: J. Random Hacker <jrandom@example.org>\n'
'branch nick: nicholas\n'
'timestamp: Thu 1970-01-01 00:16:40 +0000\n'
'message:\n'
' rev2d\n' % canonical_url(bmp), message)
def test_getRevisionMessage_with_related_rejected_BMP(self):
"""The reviewer is shown for non-approved proposals."""
job = self.makeRevisionsAddedWithMergeCommit()
hacker = self.factory.makePerson(displayname='J. Random Hacker',
name='jrandom')
reviewer = self.factory.makePerson(displayname='J. Random Reviewer',
name='jrandom2')
job.branch.reviewer = reviewer
bmp = self.factory.makeBranchMergeProposal(target_branch=job.branch,
registrant=hacker)
bmp.rejectBranch(reviewer, 'rev3-id')
bmp.source_branch.last_scanned_id = 'rev3-id'
message = job.getRevisionMessage('rev2d-id', 1)
self.assertEqual(
'Merge authors:\n'
' bar@\n'
' baz@blaine.com\n'
' foo@\n'
' qux@\n'
'Related merge proposals:\n'
' %s\n'
' proposed by: J. Random Hacker (jrandom)\n'
'------------------------------------------------------------\n'
'revno: 2 [merge]\n'
'committer: J. Random Hacker <jrandom@example.org>\n'
'branch nick: nicholas\n'
'timestamp: Thu 1970-01-01 00:16:40 +0000\n'
'message:\n'
' rev2d\n' % canonical_url(bmp), message)
def test_email_format(self):
"""Contents of the email are as expected."""
self.useBzrBranches(direct_database=True)
db_branch, tree = self.create_branch_and_tree()
first_revision = 'rev-1'
tree.bzrdir.root_transport.put_bytes('hello.txt', 'Hello World\n')
tree.add('hello.txt')
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
tree.commit(
rev_id=first_revision, message="Log message",
committer="Joe Bloggs <joe@example.com>",
timestamp=1000000000.0, timezone=0)
tree.bzrdir.root_transport.put_bytes(
'hello.txt', 'Hello World\n\nFoo Bar\n')
second_revision = 'rev-2'
tree.commit(
rev_id=second_revision, message="Extended contents",
committer="Joe Bloggs <joe@example.com>",
timestamp=1000100000.0, timezone=0)
transaction.commit()
self.layer.switchDbUser('branchscanner')
self.updateDBRevisions(db_branch, tree.branch)
expected = (
u"-"*60 + '\n'
"revno: 1" '\n'
"committer: Joe Bloggs <joe@example.com>" '\n'
"branch nick: %s" '\n'
"timestamp: Sun 2001-09-09 01:46:40 +0000" '\n'
"message:" '\n'
" Log message" '\n'
"added:" '\n'
" hello.txt" '\n' % tree.branch.nick)
job = RevisionsAddedJob.create(db_branch, '', '', '')
self.assertEqual(
job.getRevisionMessage(first_revision, 1), expected)
expected_message = (
u"-"*60 + '\n'
"revno: 2" '\n'
"committer: Joe Bloggs <joe@example.com>" '\n'
"branch nick: %s" '\n'
"timestamp: Mon 2001-09-10 05:33:20 +0000" '\n'
"message:" '\n'
" Extended contents" '\n'
"modified:" '\n'
" hello.txt" '\n' % tree.branch.nick)
tree.branch.lock_read()
tree.branch.unlock()
message = job.getRevisionMessage(second_revision, 2)
self.assertEqual(message, expected_message)
def test_message_encoding(self):
"""Test handling of non-ASCII commit messages."""
self.useBzrBranches(direct_database=True)
db_branch, tree = self.create_branch_and_tree()
rev_id = 'rev-1'
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
tree.commit(
rev_id=rev_id, message=u"Non ASCII: \xe9",
committer=u"Non ASCII: \xed", timestamp=1000000000.0,
timezone=0)
transaction.commit()
self.layer.switchDbUser('branchscanner')
self.updateDBRevisions(db_branch, tree.branch)
job = RevisionsAddedJob.create(db_branch, '', '', '')
message = job.getRevisionMessage(rev_id, 1)
# The revision message must be a unicode object.
expected = (
u'-' * 60 + '\n'
u"revno: 1" '\n'
u"committer: Non ASCII: \xed" '\n'
u"branch nick: %s" '\n'
u"timestamp: Sun 2001-09-09 01:46:40 +0000" '\n'
u"message:" '\n'
u" Non ASCII: \xe9" '\n' % tree.branch.nick)
self.assertEqual(message, expected)
def test_getMailerForRevision(self):
"""The mailer for the revision is as expected."""
self.useBzrBranches(direct_database=True)
branch, tree = self.makeBranchWithCommit()
revision = tree.branch.repository.get_revision('rev1')
job = RevisionsAddedJob.create(branch, 'rev1', 'rev1', '')
mailer = job.getMailerForRevision(revision, 1, True)
subject = mailer.generateEmail(
branch.registrant.preferredemail.email, branch.registrant).subject
self.assertEqual(
'[Branch ~jrandom/foo/bar] Rev 1: rev1', subject)
def test_only_nodiff_subscribers_means_no_diff_generated(self):
"""No diff is generated when no subscribers need it."""
self.layer.switchDbUser('launchpad')
self.useBzrBranches(direct_database=True)
branch, tree = self.create_branch_and_tree()
subscriptions = branch.getSubscriptionsByLevel(
[BranchSubscriptionNotificationLevel.FULL])
for s in subscriptions:
s.max_diff_lines = BranchSubscriptionDiffSize.NODIFF
job = RevisionsAddedJob.create(branch, '', '', '')
self.assertFalse(job.generateDiffs())
class TestRosettaUploadJob(TestCaseWithFactory):
"""Tests for RosettaUploadJob."""
layer = LaunchpadZopelessLayer
def setUp(self):
super(TestRosettaUploadJob, self).setUp()
self.series = None
def _makeBranchWithTreeAndFile(self, file_name, file_content = None):
return self._makeBranchWithTreeAndFiles(((file_name, file_content), ))
def _makeBranchWithTreeAndFiles(self, files):
"""Create a branch with a tree that contains the given files.
:param files: A list of pairs of file names and file content. file
content is a byte string and may be None or missing completely,
in which case an arbitrary unique string is used.
:returns: The revision of the first commit.
"""
self.useBzrBranches(direct_database=True)
self.branch, self.tree = self.create_branch_and_tree()
return self._commitFilesToTree(files, 'First commit')
def _makeRosettaUploadJob(self):
"""Create a `RosettaUploadJob`."""
# RosettaUploadJob's parent BranchJob is joined to Job through
# BranchJob.job, but in tests those two ids can also be the same.
# This may hide broken joins, so make sure that the ids are not
# identical.
# There are at least as many Jobs as BranchJobs, so we can whack
# the two out of any accidental sync by advancing the Job.id
# sequence.
dummy = Job()
dummy.sync()
dummy.destroySelf()
# Now create the RosettaUploadJob.
job = RosettaUploadJob.create(self.branch, NULL_REVISION)
job.job.sync()
job.context.sync()
return job
def _commitFilesToTree(self, files, commit_message=None):
"""Add files to the tree.
:param files: A list of pairs of file names and file content. file
content is a byte string and may be None or missing completely,
in which case an arbitrary unique string is used.
:returns: The revision of this commit.
"""
for file_pair in files:
file_name = file_pair[0]
try:
file_content = file_pair[1]
if file_content is None:
raise IndexError # Same as if missing.
except IndexError:
file_content = self.factory.getUniqueString()
dname = os.path.dirname(file_name)
self.tree.bzrdir.root_transport.clone(dname).create_prefix()
self.tree.bzrdir.root_transport.put_bytes(file_name, file_content)
if len(files) > 0:
self.tree.smart_add(
[self.tree.abspath(file_pair[0]) for file_pair in files])
if commit_message is None:
commit_message = self.factory.getUniqueString('commit')
# XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
# required to generate the revision-id.
with override_environ(BZR_EMAIL='me@example.com'):
revision_id = self.tree.commit(commit_message)
self.branch.last_scanned_id = revision_id
self.branch.last_mirrored_id = revision_id
return revision_id
def _makeProductSeries(self, mode):
if self.series is None:
self.series = self.factory.makeProductSeries()
self.series.branch = self.branch
self.series.translations_autoimport_mode = mode
def _runJobWithFile(self, import_mode, file_name, file_content = None):
return self._runJobWithFiles(
import_mode, ((file_name, file_content), ))
def _runJobWithFiles(self, import_mode, files,
do_upload_translations=False):
self._makeBranchWithTreeAndFiles(files)
return self._runJob(import_mode, NULL_REVISION,
do_upload_translations)
def _runJob(self, import_mode, revision_id,
do_upload_translations=False):
self._makeProductSeries(import_mode)
job = RosettaUploadJob.create(self.branch, revision_id,
do_upload_translations)
if job is not None:
job.run()
queue = getUtility(ITranslationImportQueue)
# Using getAllEntries also asserts that the right product series
# was used in the upload.
return list(queue.getAllEntries(target=self.series))
def test_providesInterface(self):
# RosettaUploadJob implements IRosettaUploadJob.
self.branch = self.factory.makeAnyBranch()
self._makeProductSeries(
TranslationsBranchImportMode.IMPORT_TEMPLATES)
job = self._makeRosettaUploadJob()
verifyObject(IRosettaUploadJob, job)
def test_upload_pot(self):
# A POT can be uploaded to a product series that is
# configured to do so, other files are not uploaded.
pot_name = "foo.pot"
entries = self._runJobWithFiles(
TranslationsBranchImportMode.IMPORT_TEMPLATES,
((pot_name,), ('eo.po',), ('README',)))
self.assertEqual(len(entries), 1)
entry = entries[0]
self.assertEqual(pot_name, entry.path)
def test_upload_pot_subdir(self):
# A POT can be uploaded from a subdirectory.
pot_path = "subdir/foo.pot"
entries = self._runJobWithFile(
TranslationsBranchImportMode.IMPORT_TEMPLATES, pot_path)
self.assertEqual(len(entries), 1)
entry = entries[0]
self.assertEqual(pot_path, entry.path)
def test_init_translation_file_lists_skip_dirs(self):
# The method _init_translation_file_lists extracts all translation
# files from the branch but does not add changed directories to the
# template_files_changed and translation_files_changed lists .
pot_path = u"subdir/foo.pot"
pot_content = self.factory.getUniqueString()
po_path = u"subdir/foo.po"
po_content = self.factory.getUniqueString()
self._makeBranchWithTreeAndFiles(((pot_path, pot_content),
(po_path, po_content)))
self._makeProductSeries(TranslationsBranchImportMode.NO_IMPORT)
job = RosettaUploadJob.create(self.branch, NULL_REVISION, True)
job._init_translation_file_lists()
self.assertEqual([(pot_path, pot_content)],
job.template_files_changed)
self.assertEqual([(po_path, po_content)],
job.translation_files_changed)
def test_upload_xpi_template(self):
# XPI templates are indentified by a special name. They are imported
# like POT files.
pot_name = "en-US.xpi"
entries = self._runJobWithFiles(
TranslationsBranchImportMode.IMPORT_TEMPLATES,
((pot_name,), ('eo.xpi',), ('README',)))
self.assertEqual(len(entries), 1)
entry = entries[0]
self.assertEqual(pot_name, entry.path)
def test_upload_empty_pot(self):
# An empty POT cannot be uploaded, if if the product series is
# configured for template import.
entries = self._runJobWithFile(
TranslationsBranchImportMode.IMPORT_TEMPLATES, 'empty.pot', '')
self.assertEqual(entries, [])
def test_upload_hidden_pot(self):
# A POT cannot be uploaded if its name starts with a dot.
entries = self._runJobWithFile(
TranslationsBranchImportMode.IMPORT_TEMPLATES, '.hidden.pot')
self.assertEqual(entries, [])
def test_upload_pot_hidden_in_subdirectory(self):
# In fact, if any parent directory is hidden, the file will not be
# imported.
entries = self._runJobWithFile(
TranslationsBranchImportMode.IMPORT_TEMPLATES,
'bar/.hidden/bla/foo.pot')
self.assertEqual(entries, [])
def test_upload_pot_uploader(self):
# The uploader of a POT is the series owner.
entries = self._runJobWithFile(
TranslationsBranchImportMode.IMPORT_TEMPLATES, 'foo.pot')
entry = entries[0]
self.assertEqual(self.series.owner, entry.importer)
def test_upload_pot_content(self):
# The content of the uploaded file is stored in the librarian.
# The uploader of a POT is the series owner.
POT_CONTENT = "pot content\n"
self._runJobWithFile(
TranslationsBranchImportMode.IMPORT_TEMPLATES,
'foo.pot', POT_CONTENT)
# Commit so that the file is stored in the librarian.
transaction.commit()
self.assertEqual(POT_CONTENT, get_newest_librarian_file().read())
def test_upload_changed_files(self):
# Only changed files are queued for import.
pot_name = "foo.pot"
revision_id = self._makeBranchWithTreeAndFiles(
((pot_name,), ('eo.po',), ('README',)))
self._commitFilesToTree(((pot_name, ), ))
entries = self._runJob(
TranslationsBranchImportMode.IMPORT_TEMPLATES, revision_id)
self.assertEqual(len(entries), 1)
entry = entries[0]
self.assertEqual(pot_name, entry.path)
def test_upload_to_no_import_series(self):
# Nothing can be uploaded to a product series that is
# not configured to do so.
entries = self._runJobWithFiles(
TranslationsBranchImportMode.NO_IMPORT,
(('foo.pot',), ('eo.po',), ('README',)))
self.assertEqual([], entries)
def test_upload_translations(self):
# A PO file can be uploaded if the series is configured for it.
po_path = "eo.po"
entries = self._runJobWithFile(
TranslationsBranchImportMode.IMPORT_TRANSLATIONS, po_path)
self.assertEqual(1, len(entries))
entry = entries[0]
self.assertEqual(po_path, entry.path)
def test_upload_template_and_translations(self):
# The same configuration will upload template and translation files
# in one go. Other files are still ignored.
entries = self._runJobWithFiles(
TranslationsBranchImportMode.IMPORT_TRANSLATIONS,
(('foo.pot',), ('eo.po',), ('fr.po',), ('README',)))
self.assertEqual(3, len(entries))
def test_upload_extra_translations_no_import(self):
# Even if the series is configured not to upload any files, the
# job can be told to upload template and translation files.
entries = self._runJobWithFiles(
TranslationsBranchImportMode.NO_IMPORT,
(('foo.pot',), ('eo.po',), ('fr.po',), ('README',)), True)
self.assertEqual(3, len(entries))
def test_upload_extra_translations_import_templates(self):
# Even if the series is configured to only upload template files, the
# job can be told to upload translation files, too.
entries = self._runJobWithFiles(
TranslationsBranchImportMode.IMPORT_TEMPLATES,
(('foo.pot',), ('eo.po',), ('fr.po',), ('README',)), True)
self.assertEqual(3, len(entries))
def test_upload_approved(self):
# A single new entry should be created approved.
entries = self._runJobWithFile(
TranslationsBranchImportMode.IMPORT_TEMPLATES, 'foo.pot')
self.assertEqual(len(entries), 1)
entry = entries[0]
self.assertEqual(RosettaImportStatus.APPROVED, entry.status)
def test_upload_simplest_case_approved(self):
# A single new entry should be created approved and linked to the
# only POTemplate object in the database, if there is only one such
# object for this product series.
self._makeBranchWithTreeAndFile('foo.pot')
self._makeProductSeries(TranslationsBranchImportMode.IMPORT_TEMPLATES)
potemplate = self.factory.makePOTemplate(self.series)
entries = self._runJob(None, NULL_REVISION)
self.assertEqual(len(entries), 1)
entry = entries[0]
self.assertEqual(potemplate, entry.potemplate)
self.assertEqual(RosettaImportStatus.APPROVED, entry.status)
def test_upload_multiple_approved(self):
# A single new entry should be created approved and linked to the
# only POTemplate object in the database, if there is only one such
# object for this product series.
self._makeBranchWithTreeAndFiles(
[('foo.pot', None), ('bar.pot', None)])
self._makeProductSeries(TranslationsBranchImportMode.IMPORT_TEMPLATES)
self.factory.makePOTemplate(self.series, path='foo.pot')
self.factory.makePOTemplate(self.series, path='bar.pot')
entries = self._runJob(None, NULL_REVISION)
self.assertEqual(len(entries), 2)
self.assertEqual(RosettaImportStatus.APPROVED, entries[0].status)
self.assertEqual(RosettaImportStatus.APPROVED, entries[1].status)
def test_iterReady_job_type(self):
# iterReady only returns RosettaUploadJobs.
self._makeBranchWithTreeAndFiles([])
self._makeProductSeries(
TranslationsBranchImportMode.IMPORT_TEMPLATES)
# Add a job that is not a RosettaUploadJob.
BranchDiffJob.create(self.branch, 0, 1)
ready_jobs = list(RosettaUploadJob.iterReady())
self.assertEqual([], ready_jobs)
def test_iterReady_not_ready(self):
# iterReady only returns RosettaUploadJobs in ready state.
self._makeBranchWithTreeAndFiles([])
self._makeProductSeries(
TranslationsBranchImportMode.IMPORT_TEMPLATES)
# Add a job and complete it -> not in ready state.
job = self._makeRosettaUploadJob()
job.job.start()
job.job.complete()
ready_jobs = list(RosettaUploadJob.iterReady())
self.assertEqual([], ready_jobs)
def test_iterReady_revision_ids_differ(self):
# iterReady does not return jobs for branches where last_scanned_id
# and last_mirror_id are different.
self._makeBranchWithTreeAndFiles([])
self.branch.last_scanned_id = NULL_REVISION # Was not scanned yet.
self._makeProductSeries(
TranslationsBranchImportMode.IMPORT_TEMPLATES)
# Put the job in ready state.
self._makeRosettaUploadJob()
ready_jobs = list(RosettaUploadJob.iterReady())
self.assertEqual([], ready_jobs)
def test_iterReady(self):
# iterReady only returns RosettaUploadJob in ready state.
self._makeBranchWithTreeAndFiles([])
self._makeProductSeries(
TranslationsBranchImportMode.IMPORT_TEMPLATES)
# Put the job in ready state.
job = self._makeRosettaUploadJob()
ready_jobs = list(RosettaUploadJob.iterReady())
self.assertEqual([job], ready_jobs)
def test_findUnfinishedJobs(self):
# findUnfinishedJobs returns jobs that haven't finished yet.
self._makeBranchWithTreeAndFiles([])
self._makeProductSeries(
TranslationsBranchImportMode.IMPORT_TEMPLATES)
job = self._makeRosettaUploadJob()
unfinished_jobs = list(RosettaUploadJob.findUnfinishedJobs(
self.branch))
self.assertEqual([job.context], unfinished_jobs)
def test_findUnfinishedJobs_does_not_find_finished_jobs(self):
# findUnfinishedJobs ignores completed jobs.
self._makeBranchWithTreeAndFiles([])
self._makeProductSeries(
TranslationsBranchImportMode.IMPORT_TEMPLATES)
job = self._makeRosettaUploadJob()
job.job.start()
job.job.complete()
unfinished_jobs = list(RosettaUploadJob.findUnfinishedJobs(
self.branch))
self.assertEqual([], unfinished_jobs)
def test_findUnfinishedJobs_does_not_find_failed_jobs(self):
# findUnfinishedJobs ignores failed jobs.
self._makeBranchWithTreeAndFiles([])
self._makeProductSeries(
TranslationsBranchImportMode.IMPORT_TEMPLATES)
job = self._makeRosettaUploadJob()
job.job.start()
job.job.complete()
job.job._status = JobStatus.FAILED
unfinished_jobs = list(RosettaUploadJob.findUnfinishedJobs(
self.branch))
self.assertEqual([], unfinished_jobs)
class TestReclaimBranchSpaceJob(TestCaseWithFactory):
layer = LaunchpadZopelessLayer
def cleanBranchArea(self):
"""Ensure that the branch area is present and empty."""
mirrored = config.codehosting.mirrored_branches_root
shutil.rmtree(mirrored, ignore_errors=True)
os.makedirs(mirrored)
self.addCleanup(shutil.rmtree, mirrored)
def setUp(self):
TestCaseWithFactory.setUp(self)
self.cleanBranchArea()
def test_providesInterface(self):
# ReclaimBranchSpaceJob implements IReclaimBranchSpaceJob.
job = getUtility(IReclaimBranchSpaceJobSource).create(
self.factory.getUniqueInteger())
self.assertProvides(job, IReclaimBranchSpaceJob)
def test_scheduled_in_future(self):
# A freshly created ReclaimBranchSpaceJob is scheduled to run in a
# week's time.
job = getUtility(IReclaimBranchSpaceJobSource).create(
self.factory.getUniqueInteger())
self.assertEqual(
datetime.timedelta(days=7),
job.job.scheduled_start - job.job.date_created)
def test_stores_id(self):
# An instance of ReclaimBranchSpaceJob stores the ID of the branch
# that has been deleted.
branch_id = self.factory.getUniqueInteger()
job = getUtility(IReclaimBranchSpaceJobSource).create(branch_id)
self.assertEqual(branch_id, job.branch_id)
def makeJobReady(self, job):
"""Force `job` to be scheduled to run now.
New `ReclaimBranchSpaceJob`s are scheduled to run a week after
creation, so to be able to test running the job we have to force them
to be scheduled now.
"""
removeSecurityProxy(job).job.scheduled_start = UTC_NOW
def runReadyJobs(self):
"""Run all ready `ReclaimBranchSpaceJob`s with the appropriate dbuser.
"""
# switchDbUser aborts the current transaction, so we need to commit to
# make sure newly added jobs are still there after we call it.
self.layer.txn.commit()
self.layer.switchDbUser(config.reclaimbranchspace.dbuser)
job_count = 0
for job in ReclaimBranchSpaceJob.iterReady():
job.run()
job_count += 1
self.assertTrue(job_count > 0, "No jobs ran!")
def test_run_no_branch_on_disk(self):
# Running a job to reclaim space for a branch that was never pushed to
# does nothing quietly.
branch_id = self.factory.getUniqueInteger()
job = getUtility(IReclaimBranchSpaceJobSource).create(branch_id)
self.makeJobReady(job)
# Just "assertNotRaises"
self.runReadyJobs()
def test_run_with_branch_on_disk(self):
# Running a job to reclaim space for a branch that was pushed to
# but never mirrored removes the branch from the hosted area.
branch_id = self.factory.getUniqueInteger()
job = getUtility(IReclaimBranchSpaceJobSource).create(branch_id)
self.makeJobReady(job)
branch_path = os.path.join(
config.codehosting.mirrored_branches_root,
branch_id_to_path(branch_id), '.bzr')
os.makedirs(branch_path)
self.runReadyJobs()
self.assertFalse(os.path.exists(branch_path))
def test_suite():
return TestLoader().loadTestsFromName(__name__)
|