(PTFE-2480) Fix Suggestions

Author: matthiasL-scality

bert_e/exceptions.py

@@ -573,12 +573,3 @@ class JobFailure(SilentException):
 
 class QueueBuildFailed(SilentException):
     code = 309
-
-
-class UnsupportedBranchType(InternalException):
-    code = 205
-
-    def __init__(self, branch_name):
-        msg = ('Unsupported branch type: %r. '
-               'Stabilization branches are no longer supported.' % branch_name)
-        super(UnsupportedBranchType, self).__init__(msg)

bert_e/tests/test_bert_e.py

@@ -190,25 +190,6 @@ def dynamic_filtering(request):
 class QuickTest(unittest.TestCase):
     """Tests which don't need to interact with an external web services"""
 
-    def test_unsupported_multiple_branches_exception(self):
-        """Test that UnsupportedMultipleBranches is raised
-        when duplicate branches are added to cascade."""
-        # Create a mock repository
-        fake_repo = Mock()
-
-        # Create two development branches with the same version
-        branch1 = gwfb.DevelopmentBranch(fake_repo, 'development/4.3')
-        branch2 = gwfb.DevelopmentBranch(fake_repo, 'development/4.3')
-
-        # Create a cascade and add the first branch
-        cascade = gwfb.BranchCascade()
-        cascade.add_branch(branch1, None)
-
-        # Adding the second branch with the same type
-        # and version should raise the exception
-        with self.assertRaises(exns.UnsupportedMultipleBranches):
-            cascade.add_branch(branch2, None)
-
     def feature_branch(self, name):
         return gwfb.FeatureBranch(None, name)
 
@@ -633,28 +614,6 @@ def test_cmd(self):
         self.assertLess(time.time() - start, 5)
         self.assertEqual('plop\n', cmd('echo plop'))
 
-    def test_unsupported_branch_type_stabilization(self):
-        """Test that stabilization branches are rejected
-        with UnsupportedBranchType."""
-        fake_repo = FakeGitRepo()
-
-        # Test various stabilization branch patterns
-        stabilization_branches = [
-            'stabilization/5.1.4',
-            'stabilization/10.0.1',
-            'stabilization/4.3.2'
-        ]
-
-        for branch_name in stabilization_branches:
-            with self.assertRaises(exns.UnsupportedBranchType) as context:
-                gwfb.branch_factory(fake_repo, branch_name)
-
-            # Verify the error message contains the branch name and explanation
-            error_msg = str(context.exception)
-            self.assertIn(branch_name, error_msg)
-            self.assertIn('Stabilization branches are no longer supported',
-                          error_msg)
-
 
 class FakeGitRepo:
     def includes_commit(self, commit):

bert_e/tests/test_server.py

@@ -484,27 +484,13 @@ def test_create_branch_api_call(self):
         )
         self.assertEqual(401, resp.status_code)
 
-        resp = self.handle_api_call(
-            'gwf/branches/stabilization/7.4.0',
-            method='POST',
-            user='test_user'
-        )
-        self.assertEqual(403, resp.status_code)
-
         resp = self.handle_api_call(
             'gwf/branches/foo/7.4',
             method='POST',
             user='test_admin'
         )
         self.assertEqual(400, resp.status_code)
 
-        resp = self.handle_api_call(
-            'gwf/branches/stabilization/7.4',
-            method='POST',
-            user='test_admin'
-        )
-        self.assertEqual(400, resp.status_code)
-
         resp = self.handle_api_call(
             'gwf/branches/development/7.4',
             data={'branch_from': 'invalid'},
@@ -520,13 +506,6 @@ def test_create_branch_api_call(self):
         )
         self.assertEqual(400, resp.status_code)
 
-        resp = self.handle_api_call(
-            'gwf/branches/stabilization/7.4.0',
-            method='POST',
-            user='test_admin'
-        )
-        self.assertEqual(400, resp.status_code)
-
         resp = self.handle_api_call(
             'gwf/branches/development/7.4',
             method='POST',
@@ -559,41 +538,20 @@ def test_delete_branch_api_call(self):
         )
         self.assertEqual(401, resp.status_code)
 
-        resp = self.handle_api_call(
-            'gwf/branches/stabilization/7.4.0',
-            method='DELETE',
-            user='test_user'
-        )
-        self.assertEqual(403, resp.status_code)
-
         resp = self.handle_api_call(
             'gwf/branches/foo/7.4',
             method='DELETE',
             user='test_admin'
         )
         self.assertEqual(400, resp.status_code)
 
-        resp = self.handle_api_call(
-            'gwf/branches/stabilization/7.4',
-            method='DELETE',
-            user='test_admin'
-        )
-        self.assertEqual(400, resp.status_code)
-
         resp = self.handle_api_call(
             'gwf/branches/development/7.4_',
             method='DELETE',
             user='test_admin'
         )
         self.assertEqual(400, resp.status_code)
 
-        resp = self.handle_api_call(
-            'gwf/branches/stabilization/7.4.0',
-            method='DELETE',
-            user='test_admin'
-        )
-        self.assertEqual(400, resp.status_code)
-
         resp = self.handle_api_call(
             'gwf/branches/development/7.4',
             method='DELETE',

bert_e/workflow/gitwaterflow/branches.py

@@ -854,11 +854,6 @@ def add_branch(self, branch, dst_branch=None):
                 sorted(self._cascade.items(), key=cmp_to_key(compare_branches))
             )
 
-        cur_branch = self._cascade[(major, minor)][branch.__class__]
-
-        if cur_branch:
-            raise errors.UnsupportedMultipleBranches(cur_branch, branch)
-
         self._cascade[(major, minor)][branch.__class__] = branch
 
     def update_versions(self, tag):
@@ -960,7 +955,7 @@ def _set_target_versions(self, dst_branch):
                     hf_branch.major, hf_branch.minor, hf_branch.micro,
                     hf_branch.hfrev))
 
-            elif dev_branch and dev_branch.has_minor is True:
+            if dev_branch and dev_branch.has_minor is True:
                 offset = 1
 
                 self.target_versions.append('%d.%d.%d' % (