Remove merge conflicts from src/testlink/testlinkapi.py

[adamsar]

Fixed the merge conflict on this. The test cases seem to be written for a specific project however.

[adamsar]

Also added external id to getTestCaseById. I think I may have violated your styleguide though as on second inspection it looks like you name your parameters by how they are reflected in the actual TestLinkAPI.

[lczub]

Hello Andrew,

I currently starts a little refactoring for the v0.4.5 to implement a more flexible handling of optional arguments. (see https://github.com/lczub/TestLink-API-Python-client/issues/7 and https://github.com/lczub/TestLink-API-Python-client/tree/generic-api)

With the, you would be able to call getTestCase() in two versions:

tlapiclient.getTestCase(testcaseid=4711)

or

tlapiclient.getTestCase(testcaseexternalid='GPROAPI-4711')

Would this be an acceptable solution for you?

[adamsar]

Hello Iczub,

That sounds like a great solution. I am concurrently working on another python implementation of the Testlink API, albeit a more "REST"-y abstraction. I think our two projects will offer developers a good selection when working with TestLink.

My project is started at https://github.com/adamsar/testlink-python-api/tree/master/testlink

The basic usage of mine would be something like:

for case in self.api.projects.get("project name").plans.get("plan_id").cases.cursor:
  case.report(platform_id='id', status=statuses.SUCCESS, notes='This is automated')

Anyway, thanks for working on this Python wrapper! I've used it in a recent project and it was quite helpful.

[lczub]

Hello Andrew (and other interested parties), I published today a pre release v0.4.5-Alpha for the generic api implementation lczub#7. Is it possible, that you make some tests with it, if this refactoring fits your requirements for the optional argument handling? Feedback are welcome under lczub/TestLink-API-Python-client/issues

Greetings Luiko