Skip to content

v2.6.2 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srautiai merged 8 commits into from
Oct 3, 2016
Merged

v2.6.2 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
42773b5
Merge pull request #44 from srautiai/devel
szprutamich Oct 1, 2016
c17a12e
Merge pull request #46 from bitbar/master
szprutamich Oct 1, 2016
e4e6b48
Overloading does not actually work in python. This change should be …
jwallis Oct 3, 2016
e8bff83
Add get_project_config()
jwallis Oct 3, 2016
66b6be4
Merge pull request #47 from jwallis/feature_constructor
Oct 3, 2016
1e7baed
Merge pull request #48 from jwallis/feature_get_project_config
Oct 3, 2016
86eddae
Bump version: 2.6.1 → 2.6.2
Oct 3, 2016
e503ce5
Update CHANGELOG
Oct 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys, os


version = '2.6.1'
version = '2.6.2'

setup(name='testdroid',
version=version,
Expand Down
32 changes: 13 additions & 19 deletions testdroid/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
""" 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
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
Expand Down Expand Up @@ -409,6 +398,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
"""
Expand Down