Fix CI broken tests

This fixes few tests that were broken on CI, mainly related to GDPR
changes made to Atlassian Cloud.

Change-Id: I0fb7877a6a5f8a4dfc54755bdbf75193c892727f

Author: ssbarnea

cspell.json

@@ -183,6 +183,8 @@
         ".eggs"
     ],
     "ignoreWords": [
+        "AACCOUNTID",
+        "GDPR",
         "I18NSPHINXOPTS",
         "hdost",
         "βρέθηκε"

jira/client.py

@@ -3323,23 +3323,28 @@ def backup_download(self, filename=None):
         return None
 
     def current_user(self):
-        """Returns the username of the current user.
+        """Returns the username or account-id of the current user. For anonymous
+        users it will return a value that evaluates as False.
 
         :rtype: str
         """
-        if not hasattr(self, '_serverInfo') or 'username' not in self._serverInfo:
+        if not hasattr(self, '_myself'):
 
-            url = self._get_url('serverInfo')
+            url = self._get_url('myself')
             r = self._session.get(url, headers=self._options['headers'])
 
             r_json = json_loads(r)
-            if 'x-ausername' in r.headers:
-                r_json['username'] = r.headers['x-ausername']
-            else:
-                r_json['username'] = None
-            self._serverInfo = r_json
+            self._myself = r_json
+            print(r_json, r.headers)
+            # if 'X-AACCOUNTID' in r.headers:
+            #     r_json['username'] = r.headers['X-AACCOUNTID']
+            # elif 'x-ausername' in r.headers:
+            #     r_json['username'] = r.headers['x-ausername']
+            # else:
+            #     r_json['username'] = None
             # del r_json['self']  # this isn't really an addressable resource
-        return self._serverInfo['username']
+        print(self._myself)
+        return self._myself['name']
 
     def delete_project(self, pid):
         """Delete project from Jira.
@@ -3469,7 +3474,7 @@ def create_project(self, key, name=None, assignee=None, type="Software", templat
                    'projectTemplateWebItemKey': template_key,
                    'projectTemplateModuleKey': template_key,
                    'lead': assignee,
-                   # 'assigneeType': '2',
+                   'assigneeType': 'PROJECT_LEAD',
                    }
 
         if self._version[0] > 6:

tests/test_client.py

@@ -2,9 +2,10 @@
 from __future__ import unicode_literals
 import getpass
 import pytest
+from tenacity import retry
+from tenacity import wait_random_exponential
 from tests import get_unique_project_name
 from tests import JiraTestManager
-import time
 
 from jira import Role, Issue, JIRA, JIRAError, Project  # noqa
 import jira.client
@@ -56,22 +57,16 @@ def remove_by_slug():
     return slug
 
 
-@pytest.mark.timeout(180)
+@retry(wait=wait_random_exponential(multiplier=1, max=180))
 def test_delete_project(cl_admin, cl_normal, slug):
-    for i in range(6):
-        time.sleep(1)  # with <=5s was failing often
 
-        with pytest.raises(ValueError) as ex:
-            assert cl_normal.delete_project(slug)
+    with pytest.raises(JIRAError) as ex:
+        assert cl_normal.delete_project(slug)
 
         assert 'Not enough permissions to delete project' in str(ex.value) \
             or str(ex.value).endswith('is not a Project, projectID or slug')
 
-    try:
-        assert cl_admin.delete_project(slug)
-    except Exception as e:
-        e.message += " slug=%s" % slug
-        raise
+    assert cl_admin.delete_project(slug)
 
 
 def test_delete_inexistent_project(cl_admin):

tests/tests.py

@@ -179,7 +179,7 @@ def __init__(self):
                     else:
                         self.jira_admin = JIRA(self.CI_JIRA_URL, validate=True,
                                                logging=False, max_retries=self.max_retries)
-                if self.jira_admin.current_user() != self.CI_JIRA_ADMIN:
+                if not self.jira_admin.current_user():
                     self.initialized = 1
                     sys.exit(3)
 
@@ -543,13 +543,13 @@ def test_3_update(self):
 
         component = self.jira.create_component(name,
                                                self.project_b, description='stand by!',
-                                               leadUserName=self.test_manager.CI_JIRA_ADMIN)
+                                               leadUserName=self.jira.current_user())
         name = 'renamed-' + name
         component.update(name=name, description='It is done.',
-                         leadUserName=self.test_manager.CI_JIRA_ADMIN)
+                         leadUserName=self.jira.current_user())
         self.assertEqual(component.name, name)
         self.assertEqual(component.description, 'It is done.')
-        self.assertEqual(component.lead.name, self.test_manager.CI_JIRA_ADMIN)
+        self.assertEqual(component.lead.name, self.jira.current_user())
         component.delete()
 
     def test_4_delete(self):