contrib.httplib.patch: Don't overwrite return value

[yoichi]

Fix #323

[palazzem]

Thanks for this contribution @yoichi ! We'll review and ship that one with a minor bugfix release if the 0.11.0 takes more time.

[palazzem]

Thanks a lot for the contribution @yoichi ! going to merge as soon the CI is green!

[yoichi]

ci/circleci: mysqlconnector — Your tests failed on CircleCI

It's not caused by my change.

tests/wait-for-services.py:

    if len(sys.argv) > 2:
        for service in sys.argv[1:]:
            check_functions[service]()
    else:
        print("usage: python {} SERVICE_NAME".format(sys.argv[0]))
        sys.exit(1)

condition should be len(sys.argv) >= 2.

[yoichi]

I think CircleCI test failure is not caused by the change of this PR.
It is caused by a timing issue of existing test code:
https://github.com/DataDog/dd-trace-py/blob/master/tests/test_integration.py#L197
sleep a little more (e.g. 1.1 seconds) will reduce the frequency of occurance.

Regards,

======================================================================
FAIL: test_worker_http_error_logging (tests.test_integration.TestWorkers)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/root/project/tests/test_integration.py", line 202, in test_worker_http_error_logging
    eq_(len(logged_errors), 1)
AssertionError: 0 != 1

[palazzem]

@yoichi ok let me see if we can make it pass. In general I don't want to rely on timings because it makes the test flaky. Let me schedule some work on our tests otherwise it would be difficult for you to contribute to this repository.

Thanks for spotting that by the way!

[palazzem]

@yoichi sorry for late response! everything is good and we're going to merge that PR now. Thank you very much for your contribution!

/cc @thehesiod