Reviewed:  https://review.openstack.org/232270
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=6dcfe3a9362ae5fcf18e5cfb59663e43446cd59c
Submitter: Jenkins
Branch:    stable/liberty

commit 6dcfe3a9362ae5fcf18e5cfb59663e43446cd59c
Author: Kevin Benton <email address hidden>
Date:   Tue Oct 6 19:28:47 2015 -0700

    Mock oslo policy HTTPCheck instead of urllib
    
    We were mocking internal behavior of oslo policy by
    patching urllib. This will break with the upcoming oslo
    release that switches to requests.
    
    This patch changes the mock to the HTTPCheck level and we
    can leave implementation details testing up to oslo_policy.
    
    Change-Id: I07957f01307e25f1547197c720eea6e3e7f0ef5a
    Closes-Bug: #1503890
    (cherry picked from commit a0f1d9d6de1560be91d3001c8ac9f880a7a5a7e0)
    
    Add testresources used by oslo.db fixture
    
    If we use oslo.db fixtures, we'll need the package or
    the next version of oslo.db release will break us.
    
    Closes-Bug: #1503501
    Change-Id: I7dfbf240333095d91a414ba15a439bdc4804eb25
    (cherry picked from commit 86ad967e40c2c6752ec0fb46cfd3098ede0c7178)
    
    Fix functional test_server tests
    
    Now oslo.service 0.10.0 no longer sends SIGHUP to parent and
    children services.
    
    This was a chance introduced by 286a6ea, and since it invalidated
    the very logic under test, this must be revised.
    
    (cherry picked from commit 090fe713592c2b6398d999bfa03b80cbb2054609)
    
    Change-Id: I18a11283925369bc918002477774f196010a1bc3
    Closes-bug: #1505438
    (cherry picked from commit 090fe713592c2b6398d999bfa03b80cbb2054609)
    
    Make test_server work with older versions of oslo.service
    
    Change I18a11283925369bc918002477774f196010a1bc3 fixed the test for
    oslo.service >= 0.10.0, but it also broke it for older versions of
    oslo.service. Since the library has minimal version of >= 0.7.0 in
    requirements.txt, test should pass for those versions too.
    
    Now, instead of validating that either reset() or restart() of workers
    are triggered on SIGHUP, just validate that .start() is triggered the
    expected number of times (either way, no matter how oslo.service decide
    to clean up the children, they exit and then are respawned).
    
    Change-Id: I41f9d3af780b3178b075bc1e7084f417a2bd1378
    Closes-Bug: #1505645
    (cherry picked from commit 7bb40921660cf29beb68e338e205499efd6ffa36)
    
    Fixed multiple py34 gate issues
    
    1. Scope mock of 'open' to module
    
    By mocking 'open' at the module level, we can avoid affecting
    'open' calls from other modules.
    
    2. Stop using LOG.exception in contexts with no sys.exc_info set
    
    Python 3.4 logger fills in record.exc_info with sys.exc_info() result
    [1], and then it uses it to determine the current exception [2] to
    append to the log message. Since there is no exception, exc_info[1] is
    None, and we get AttributeError inside traceback module.
    
    It's actually a bug in Python interpreter that it attempt to access the
    attribute when there is no exception. It turns out that it's fixed in
    latest master of cPython [3] (the intent of the patch does not seem
    relevant, but it removes the offending code while reshuffling the code).
    Note that now cPython correctly checks the exception value before
    accessing its attributes [4].
    
    The patch in cPython that resulted in the failure is [5] and is present
    since initial Python 3k releases.
    
    The patch in fixtures that broke us is [6].
    
    [1]: https://hg.python.org/cpython/file/tip/Lib/logging/__init__.py#l1412
    [2]: https://hg.python.org/cpython/file/tip/Lib/logging/__init__.py#l575
    [3]: https://hg.python.org/cpython/rev/73afda5a4e4c
    [4]: https://hg.python.org/cpython/rev/73afda5a4e4c#l6.484
    [5]: https://hg.python.org/cpython/rev/2ee09afee126
    [6]: https://github.com/testing-cabal/fixtures/commit/67dd2956943261e845a866dab155208c51da937e
    
    Closes-Bug: #1503847
    Closes-Bug: #1504053
    Co-Authored-By: Ihar Hrachyshka <email address hidden>
    Change-Id: I456b7846b8a53e4d3f8c91583685e0e1eaa84719
    (cherry picked from commit 8f58bbf38f5984e70d6e0be7427deb99d7782d1d)