pythonthings
diff --git a/Collapse file
‎gitlab/__init__.py‎
Copy file name to clipboardExpand all lines: gitlab/__init__.py
+38-9Lines changed: 38 additions & 9 deletions b/Collapse file
‎gitlab/__init__.py‎
Copy file name to clipboardExpand all lines: gitlab/__init__.py
+38-9Lines changed: 38 additions & 9 deletions
diff --git a/Collapse file
‎gitlab/exceptions.py‎
Copy file name to clipboardExpand all lines: gitlab/exceptions.py
+4Lines changed: 4 additions & 0 deletions b/Collapse file
‎gitlab/exceptions.py‎
Copy file name to clipboardExpand all lines: gitlab/exceptions.py
+4Lines changed: 4 additions & 0 deletions
diff --git a/Collapse file
‎tools/ee-test.py‎
Copy file name to clipboardExpand all lines: tools/ee-test.py
+9Lines changed: 9 additions & 0 deletions b/Collapse file
‎tools/ee-test.py‎
Copy file name to clipboardExpand all lines: tools/ee-test.py
+9Lines changed: 9 additions & 0 deletions
@@ -228,6 +228,7 @@ def version(self):
 
         return self._server_version, self._server_revision
 
+    @on_http_error(GitlabVerifyError)
     def lint(self, content, **kwargs):
         """Validate a gitlab CI configuration.
 
@@ -244,13 +245,10 @@ def lint(self, content, **kwargs):
                 otherwise
         """
         post_data = {'content': content}
-        try:
-            data = self.http_post('/ci/lint', post_data=post_data, **kwargs)
-        except Exception:
-            raise GitlabVerifyError
-
+        data = self.http_post('/ci/lint', post_data=post_data, **kwargs)
         return (data['status'] == 'valid', data['errors'])
 
+    @on_http_error(GitlabMarkdownError)
     def markdown(self, text, gfm=False, project=None, **kwargs):
         """Render an arbitrary Markdown document.
 
@@ -272,12 +270,43 @@ def markdown(self, text, gfm=False, project=None, **kwargs):
         post_data = {'text': text, 'gfm': gfm}
         if project is not None:
             post_data['project'] = project
-        try:
-            data = self.http_post('/markdown', post_data=post_data, **kwargs)
-        except Exception:
-            raise GitlabMarkdownError
+        data = self.http_post('/markdown', post_data=post_data, **kwargs)
         return data['html']
 
+    @on_http_error(GitlabLicenseError)
+    def get_license(self, **kwargs):
+        """Retrieve information about the current license.
+
+        Args:
+            **kwargs: Extra options to send to the server (e.g. sudo)
+
+        Raises:
+            GitlabAuthenticationError: If authentication is not correct
+            GitlabGetError: If the server cannot perform the request
+
+        Returns:
+            dict: The current license information
+        """
+        return self.http_get('/license', **kwargs)
+
+    @on_http_error(GitlabLicenseError)
+    def set_license(self, license, **kwargs):
+        """Add a new license.
+
+        Args:
+            license (str): The license string
+            **kwargs: Extra options to send to the server (e.g. sudo)
+
+        Raises:
+            GitlabAuthenticationError: If authentication is not correct
+            GitlabPostError: If the server cannot perform the request
+
+        Returns:
+            dict: The new license information
+        """
+        data = {'license': license}
+        return self.http_post('/license', post_data=data, **kwargs)
+
     def _construct_url(self, id_, obj, parameters, action=None):
         if 'next_url' in parameters:
             return parameters['next_url']
 
@@ -221,6 +221,10 @@ class GitlabRepairError(GitlabOperationError):
     pass
 
 
+class GitlabLicenseError(GitlabOperationError):
+    pass
+
+
 def on_http_error(error):
     """Manage GitlabHttpError exceptions.
 
 
@@ -111,3 +111,12 @@ def end_log():
 assert(pr.deny_delete_tag == False)
 pr.delete()
 end_log()
+
+start_log('license')
+l = gl.get_license()
+assert('user_limit' in l)
+try:
+    gl.set_license('dummykey')
+except Exception as e:
+    assert('The license key is invalid.' in e.error_message)
+end_log()