Add three digit to the base tests

Author: matthiasL-scality

bert_e/tests/test_bert_e.py

@@ -104,8 +104,9 @@ def initialize_git_repo(repo, username, usermail):
     repo.cmd('git add a')
     repo.cmd('git commit -m "Initial commit"')
     repo.cmd('git remote add origin ' + repo._url)
-    for major, minor, micro in [(4, 3, 18), (5, 1, 4), (10, 0, 0)]:
+    for major, minor, micro in [(4, 3, 18), (5, 1, 4), (10, 0, 1)]:
         major_minor = "%s.%s" % (major, minor)
+        major_minor_micro = "%s.%s.%s" % (major, minor, micro)
         create_branch(repo, 'release/' + major_minor, do_push=False)
         if major != 10:
             create_branch(repo, 'hotfix/%s.%s.%s' %
@@ -119,11 +120,15 @@ def initialize_git_repo(repo, username, usermail):
                           do_push=False)
         else:
             create_branch(repo, 'hotfix/10.0.0', do_push=False)
+        create_branch(repo, f'development/{major}.{minor}.{micro}',
+                      file_=True, do_push=False)
         create_branch(repo, 'development/' + major_minor,
+                      f'development/{major_minor_micro}',
                       file_=True, do_push=False)
         create_branch(repo, f'development/{major}',
                       f'development/{major_minor}',
                       file_=True, do_push=False)
+
         if major != 6 and major != 10:
             repo.cmd('git tag %s.%s.%s', major, minor, micro - 1)
 
@@ -4941,6 +4946,10 @@ def empty_solution(self):
                 gwfb.QueueBranch: self.queue_branch('q/4'),
                 gwfb.QueueIntegrationBranch: []
             }),
+            ((5, 1, 4), {
+                gwfb.QueueBranch: self.queue_branch('q/5.1.4'),
+                gwfb.QueueIntegrationBranch: []
+            }),
             ((5, 1), {
                 gwfb.QueueBranch: self.queue_branch('q/5.1'),
                 gwfb.QueueIntegrationBranch: []
@@ -4949,6 +4958,10 @@ def empty_solution(self):
                 gwfb.QueueBranch: self.queue_branch('q/5'),
                 gwfb.QueueIntegrationBranch: []
             }),
+            ((10, 0, 1), {
+                gwfb.QueueBranch: self.queue_branch('q/10.0.1'),
+                gwfb.QueueIntegrationBranch: []
+            }),
             ((10, 0), {
                 gwfb.QueueBranch: self.queue_branch('q/10.0'),
                 gwfb.QueueIntegrationBranch: []
@@ -4966,48 +4979,63 @@ def standard_solution(self):
             ((4, 3), {
                 gwfb.QueueBranch: self.queue_branch('q/4.3'),
                 gwfb.QueueIntegrationBranch: [
-                    self.qint_branch('q/w/13/4.3/improvement/bar2'),
+                    self.qint_branch('q/w/16/4.3/improvement/bar2'),
                     self.qint_branch('q/w/1/4.3/improvement/bar')
                 ]
             }),
             ((4, None), {
                 gwfb.QueueBranch: self.queue_branch('q/4'),
                 gwfb.QueueIntegrationBranch: [
-                    self.qint_branch('q/w/13/4/improvement/bar2'),
+                    self.qint_branch('q/w/16/4/improvement/bar2'),
                     self.qint_branch('q/w/1/4/improvement/bar')
                 ]
             }),
+            ((5, 1, 4), {
+                gwfb.QueueBranch: self.queue_branch('q/5.1.4'),
+                gwfb.QueueIntegrationBranch: [
+                    self.qint_branch('q/w/16/5.1.4/improvement/bar2'),
+                    self.qint_branch('q/w/1/5.1.4/improvement/bar')
+                ]
+            }),
             ((5, 1), {
                 gwfb.QueueBranch: self.queue_branch('q/5.1'),
                 gwfb.QueueIntegrationBranch: [
-                    self.qint_branch('q/w/13/5.1/improvement/bar2'),
-                    self.qint_branch('q/w/9/5.1/bugfix/bar'),
+                    self.qint_branch('q/w/16/5.1/improvement/bar2'),
+                    self.qint_branch('q/w/11/5.1/bugfix/bar'),
                     self.qint_branch('q/w/1/5.1/improvement/bar')
                 ]
             }),
             ((5, None), {
                 gwfb.QueueBranch: self.queue_branch('q/5'),
                 gwfb.QueueIntegrationBranch: [
-                    self.qint_branch('q/w/13/5/improvement/bar2'),
-                    self.qint_branch('q/w/9/5/bugfix/bar'),
+                    self.qint_branch('q/w/16/5/improvement/bar2'),
+                    self.qint_branch('q/w/11/5/bugfix/bar'),
                     self.qint_branch('q/w/1/5/improvement/bar')
                 ]
             }),
+            ((10, 0, 1), {
+                gwfb.QueueBranch: self.queue_branch('q/10.0.1'),
+                gwfb.QueueIntegrationBranch: [
+                    self.qint_branch('q/w/16/10.0.1/improvement/bar2'),
+                    self.qint_branch('q/w/11/10.0.1/bugfix/bar'),
+                    self.qint_branch('q/w/1/10.0.1/improvement/bar')
+                ]
+            }),
             ((10, 0), {
                 gwfb.QueueBranch: self.queue_branch('q/10.0'),
                 gwfb.QueueIntegrationBranch: [
-                    self.qint_branch('q/w/13/10.0/improvement/bar2'),
-                    self.qint_branch('q/w/9/10.0/bugfix/bar'),
-                    self.qint_branch('q/w/7/10.0/feature/foo'),
+                    self.qint_branch('q/w/16/10.0/improvement/bar2'),
+                    self.qint_branch('q/w/11/10.0/bugfix/bar'),
+                    self.qint_branch('q/w/9/10.0/feature/foo'),
                     self.qint_branch('q/w/1/10.0/improvement/bar')
                 ]
             }),
             ((10, None), {
                 gwfb.QueueBranch: self.queue_branch('q/10'),
                 gwfb.QueueIntegrationBranch: [
-                    self.qint_branch('q/w/13/10/improvement/bar2'),
-                    self.qint_branch('q/w/9/10/bugfix/bar'),
-                    self.qint_branch('q/w/7/10/feature/foo'),
+                    self.qint_branch('q/w/16/10/improvement/bar2'),
+                    self.qint_branch('q/w/11/10/bugfix/bar'),
+                    self.qint_branch('q/w/9/10/feature/foo'),
                     self.qint_branch('q/w/1/10/improvement/bar')
                 ]
             }),
@@ -5019,8 +5047,8 @@ def test_queueing_standard_problem(self):
         qc.finalize()
         qc.validate()
         self.assertEqual(qc._queues, self.standard_solution)
-        self.assertEqual(qc.queued_prs, [1, 7, 9, 13])
-        self.assertEqual(qc.mergeable_prs, [1, 7, 9, 13])
+        self.assertEqual(qc.queued_prs, [1, 9, 11, 16])
+        self.assertEqual(qc.mergeable_prs, [1, 9, 11, 16])
         self.assertEqual(qc.mergeable_queues, self.standard_solution)
 
     def test_queueing_standard_problem_reverse(self):
@@ -5029,8 +5057,8 @@ def test_queueing_standard_problem_reverse(self):
         qc.finalize()
         qc.validate()
         self.assertEqual(qc._queues, self.standard_solution)
-        self.assertEqual(qc.queued_prs, [1, 7, 9, 13])
-        self.assertEqual(qc.mergeable_prs, [1, 7, 9, 13])
+        self.assertEqual(qc.queued_prs, [1, 9, 11, 16])
+        self.assertEqual(qc.mergeable_prs, [1, 9, 11, 16])
         self.assertEqual(qc.mergeable_queues, self.standard_solution)
 
     def test_queueing_standard_problem_without_octopus(self):
@@ -5044,8 +5072,8 @@ def test_queueing_standard_problem_without_octopus(self):
             qc.finalize()
             qc.validate()
             self.assertEqual(qc._queues, self.standard_solution)
-            self.assertEqual(qc.queued_prs, [1, 7, 9, 13])
-            self.assertEqual(qc.mergeable_prs, [1, 7, 9, 13])
+            self.assertEqual(qc.queued_prs, [1, 9, 11, 16])
+            self.assertEqual(qc.mergeable_prs, [1, 9, 11, 16])
             self.assertEqual(qc.mergeable_queues, self.standard_solution)
         finally:
             gwfi.octopus_merge = git_utils.octopus_merge
@@ -5057,17 +5085,19 @@ def test_queueing_last_pr_build_not_started(self):
         solution = deepcopy(self.standard_solution)
         solution[(4, 3)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(4, None)][gwfb.QueueIntegrationBranch].pop(0)
+        solution[(5, 1, 4)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(5, 1)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(5, None)][gwfb.QueueIntegrationBranch].pop(0)
+        solution[(10, 0, 1)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(10, 0)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(10, None)][gwfb.QueueIntegrationBranch].pop(0)
         qbranches = self.submit_problem(problem)
         qc = self.feed_queue_collection(qbranches)
         qc.finalize()
         qc.validate()
         self.assertEqual(qc._queues, self.standard_solution)
-        self.assertEqual(qc.queued_prs, [1, 7, 9, 13])
-        self.assertEqual(qc.mergeable_prs, [1, 7, 9])
+        self.assertEqual(qc.queued_prs, [1, 9, 11, 16])
+        self.assertEqual(qc.mergeable_prs, [1, 9, 11])
         self.assertEqual(qc.mergeable_queues, solution)
 
     def test_queueing_last_pr_build_failed(self):
@@ -5076,17 +5106,19 @@ def test_queueing_last_pr_build_failed(self):
         solution = deepcopy(self.standard_solution)
         solution[(4, 3)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(4, None)][gwfb.QueueIntegrationBranch].pop(0)
+        solution[(5, 1, 4)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(5, 1)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(5, None)][gwfb.QueueIntegrationBranch].pop(0)
+        solution[(10, 0, 1)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(10, 0)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(10, None)][gwfb.QueueIntegrationBranch].pop(0)
         qbranches = self.submit_problem(problem)
         qc = self.feed_queue_collection(qbranches)
         qc.finalize()
         qc.validate()
         self.assertEqual(qc._queues, self.standard_solution)
-        self.assertEqual(qc.queued_prs, [1, 7, 9, 13])
-        self.assertEqual(qc.mergeable_prs, [1, 7, 9])
+        self.assertEqual(qc.queued_prs, [1, 9, 11, 16])
+        self.assertEqual(qc.mergeable_prs, [1, 9, 11])
         self.assertEqual(qc.mergeable_queues, solution)
 
     def test_queueing_last_pr_other_key(self):
@@ -5095,17 +5127,19 @@ def test_queueing_last_pr_other_key(self):
         solution = deepcopy(self.standard_solution)
         solution[(4, 3)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(4, None)][gwfb.QueueIntegrationBranch].pop(0)
+        solution[(5, 1, 4)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(5, 1)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(5, None)][gwfb.QueueIntegrationBranch].pop(0)
+        solution[(10, 0, 1)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(10, 0)][gwfb.QueueIntegrationBranch].pop(0)
         solution[(10, None)][gwfb.QueueIntegrationBranch].pop(0)
         qbranches = self.submit_problem(problem)
         qc = self.feed_queue_collection(qbranches)
         qc.finalize()
         qc.validate()
         self.assertEqual(qc._queues, self.standard_solution)
-        self.assertEqual(qc.queued_prs, [1, 7, 9, 13])
-        self.assertEqual(qc.mergeable_prs, [1, 7, 9])
+        self.assertEqual(qc.queued_prs, [1, 9, 11, 16])
+        self.assertEqual(qc.mergeable_prs, [1, 9, 11])
         self.assertEqual(qc.mergeable_queues, solution)
 
     def test_queueing_fail_masked_by_success(self):
@@ -5118,8 +5152,8 @@ def test_queueing_fail_masked_by_success(self):
         qc.finalize()
         qc.validate()
         self.assertEqual(qc._queues, self.standard_solution)
-        self.assertEqual(qc.queued_prs, [1, 7, 9, 13])
-        self.assertEqual(qc.mergeable_prs, [1, 7, 9, 13])
+        self.assertEqual(qc.queued_prs, [1, 9, 11, 16])
+        self.assertEqual(qc.mergeable_prs, [1, 9, 11, 16])
         self.assertEqual(qc.mergeable_queues, self.standard_solution)
 
     def test_queueing_all_failed(self):
@@ -5132,7 +5166,7 @@ def test_queueing_all_failed(self):
         qc.finalize()
         qc.validate()
         self.assertEqual(qc._queues, self.standard_solution)
-        self.assertEqual(qc.queued_prs, [1, 7, 9, 13])
+        self.assertEqual(qc.queued_prs, [1, 9, 11, 16])
         self.assertEqual(qc.mergeable_prs, [])
         self.assertEqual(qc.mergeable_queues, self.empty_solution)
 
@@ -5146,7 +5180,7 @@ def test_queueing_all_inprogress(self):
         qc.finalize()
         qc.validate()
         self.assertEqual(qc._queues, self.standard_solution)
-        self.assertEqual(qc.queued_prs, [1, 7, 9, 13])
+        self.assertEqual(qc.queued_prs, [1, 9, 11, 16])
         self.assertEqual(qc.mergeable_prs, [])
         self.assertEqual(qc.mergeable_queues, self.empty_solution)
 
@@ -5160,7 +5194,7 @@ def test_queueing_mixed_fails(self):
         qc.finalize()
         qc.validate()
         self.assertEqual(qc._queues, self.standard_solution)
-        self.assertEqual(qc.queued_prs, [1, 7, 9, 13])
+        self.assertEqual(qc.queued_prs, [1, 9, 11, 16])
         self.assertEqual(qc.mergeable_prs, [])
         self.assertEqual(qc.mergeable_queues, self.empty_solution)
 
@@ -5273,7 +5307,7 @@ def test_validation_masterq_diverged(self):
 
     def test_validation_vertical_inclusion(self):
         qbranches = self.submit_problem(self.standard_problem)
-        add_file_to_branch(self.gitrepo, 'q/w/13/5.1/improvement/bar2',
+        add_file_to_branch(self.gitrepo, 'q/w/16/5.1/improvement/bar2',
                            'file_pushed_without_bert-e.txt', do_push=True)
         qc = self.feed_queue_collection(qbranches)
         qc.finalize()
@@ -5352,6 +5386,7 @@ def test_system_nominal_case(self):
             'w/10.0/bugfix/TEST-00001',
             'w/10/bugfix/TEST-00001'
         ]
+
         for branch in expected_branches:
             self.assertTrue(self.gitrepo.remote_branch_exists(branch))
 
@@ -6029,9 +6064,10 @@ def test_status_with_queue(self):
 
         status = self.berte.status.get('merge queue', OrderedDict())
         self.assertIn(1, status)
-        self.assertEqual(len(status[1]), 6)
+        self.assertEqual(len(status[1]), 8)
         versions = tuple(version for version, _ in status[1])
-        self.assertEqual(versions, ('10', '10.0', '5', '5.1', '4', '4.3'))
+        self.assertEqual(versions, ('10', '10.0', '10.0.1', '5',
+                                    '5.1', '5.1.4', '4', '4.3'))
         for _, sha1 in status[1]:
             self.set_build_status(sha1=sha1, state='SUCCESSFUL')
         self.process_sha1_job(sha1_q_10_0, 'Merged')
@@ -6077,7 +6113,8 @@ def test_status_with_queue_without_octopus(self):
             versions = tuple(version for version, _ in status[1])
             for _, sha1 in status[1]:
                 self.set_build_status(sha1=sha1, state='SUCCESSFUL')
-            self.assertEqual(versions, ('10', '10.0', '5', '5.1', '4', '4.3'))
+            self.assertEqual(versions, ('10', '10.0', '10.0.1',
+                                        '5', '5.1', '5.1.4', '4', '4.3'))
             self.process_sha1_job(sha1_q_10_0, 'Merged')
 
             merged_pr = self.berte.status.get('merged PRs', [])
@@ -6309,7 +6346,7 @@ def test_job_create_branch_dev_start(self):
         self.gitrepo._get_remote_branches(force=True)
         self.assertEqual(
             self.gitrepo._remote_branches['development/2.9'],
-            self.gitrepo._remote_branches['development/4.3']
+            self.gitrepo._remote_branches['development/4.3.18']
         )
 
         self.gitrepo.cmd('git fetch')
@@ -6444,7 +6481,7 @@ def test_job_create_branch_dev_end(self):
             'q/w/3/10.0/feature/TEST-03',
             'q/w/3/10/feature/TEST-03',
             'q/w/3/11.3/feature/TEST-03',
-            'q/w/22/11.3/feature/TEST-9997',
+            'q/w/28/11.3/feature/TEST-9997',
         ]
         self.gitrepo._get_remote_branches(force=True)
         for branch in expected_branches:
@@ -6531,10 +6568,10 @@ def test_job_delete_branch(self):
             ('q/w/3/5/feature/TEST-03', self.assertTrue),
             ('q/w/3/10.0/feature/TEST-03', self.assertTrue),
             ('q/w/3/10/feature/TEST-03', self.assertTrue),
-            ('q/w/13/5.1/feature/TEST-9998', self.assertTrue),
-            ('q/w/13/5/feature/TEST-9998', self.assertTrue),
-            ('q/w/13/10.0/feature/TEST-9998', self.assertTrue),
-            ('q/w/13/10/feature/TEST-9998', self.assertTrue),
+            ('q/w/16/5.1/feature/TEST-9998', self.assertTrue),
+            ('q/w/16/5/feature/TEST-9998', self.assertTrue),
+            ('q/w/16/10.0/feature/TEST-9998', self.assertTrue),
+            ('q/w/16/10/feature/TEST-9998', self.assertTrue),
         ]
         self.gitrepo._get_remote_branches(force=True)
         for branch, func in expected_branches: