From e4e6b48cbdd86aaf04f33f200d6d70c216add1fc Mon Sep 17 00:00:00 2001 From: Joshua Wallis Date: Mon, 3 Oct 2016 16:54:48 -0500 Subject: [PATCH 1/4] Overloading does not actually work in python. This change should be backwards compatible --- testdroid/__init__.py | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/testdroid/__init__.py b/testdroid/__init__.py index 5351925..fc4a84c 100755 --- a/testdroid/__init__.py +++ b/testdroid/__init__.py @@ -100,25 +100,14 @@ class Testdroid: # polling interval when awaiting for test run completion polling_interval_mins = 10 - """ Simple constructor, defaults against cloud.testdroid.com - """ - def __init__(self): - self.cloud_url="https://cloud.testdroid.com" - - """ Full constructor with username and password - """ - def __init__(self, username=None, password=None, url="https://cloud.testdroid.com", download_buffer_size=65536): - self.username = username - self.password = password - self.cloud_url = url - self.download_buffer_size = download_buffer_size - - """ Full constructor with api key - """ - def __init__(self, apikey=None, url="https://cloud.testdroid.com", download_buffer_size=65536): - self.api_key = apikey - self.cloud_url = url - self.download_buffer_size = download_buffer_size + """ Constructor, defaults against cloud.testdroid.com + """ + def __init__(self, **kwargs): + self.api_key = kwargs.get('apikey') + self.username = kwargs.get('username') + self.password = kwargs.get('password') + self.cloud_url = kwargs.get('url') or "https://cloud.testdroid.com" + self.download_buffer_size = kwargs.get('download_buffer_size') or 65536 def set_apikey(self, apikey): self.api_key = apikey From e8bff83a5257851a1ee3dfbb431065f7b80b2b80 Mon Sep 17 00:00:00 2001 From: Joshua Wallis Date: Mon, 3 Oct 2016 16:56:11 -0500 Subject: [PATCH 2/4] Add get_project_config() --- testdroid/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testdroid/__init__.py b/testdroid/__init__.py index 5351925..bac4bfb 100755 --- a/testdroid/__init__.py +++ b/testdroid/__init__.py @@ -409,6 +409,11 @@ def set_project_parameters(self, project_id, parameters): path = "/users/%s/projects/%s/config/parameters" % ( me['id'], project_id ) return self.post(path=path, payload=parameters) + """ Get project config + """ + def get_project_config(self, project_id): + path = "/me/projects/%s/config" % ( project_id ) + return self.get(path=path) """ Set project config according to http://docs.testdroid.com/_pages/client.html#project-config """ From 86eddaecabae822d28ba25580dfebe37be8c2a06 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Tue, 4 Oct 2016 00:53:03 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Bump=20version:=202.6.1=20=E2=86=92=202.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- testdroid/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 38b44e1..90b1dc0 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import sys, os -version = '2.6.1' +version = '2.6.2' setup(name='testdroid', version=version, diff --git a/testdroid/__init__.py b/testdroid/__init__.py index 6b6de3c..690bf1c 100755 --- a/testdroid/__init__.py +++ b/testdroid/__init__.py @@ -5,7 +5,7 @@ from optparse import OptionParser from datetime import datetime -__version__ = '2.6.1' +__version__ = '2.6.2' FORMAT = "%(message)s" logging.basicConfig(format=FORMAT) From e503ce543107e3cec836b79c5b2493ff87859186 Mon Sep 17 00:00:00 2001 From: Sakari Rautiainen Date: Mon, 3 Oct 2016 15:56:56 -0700 Subject: [PATCH 4/4] Update CHANGELOG --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 40d5db4..c271d74 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2.6.2 + * Fixes: Init overloading fixed, api key usage for delete and posts + * Features: Get project config. 2.6.1 * Added ability to set project framework 2.6.0