[oracle][test] lower cx_Oracle dep, issue with version 6.0

.travis.yml

@@ -31,6 +31,7 @@ env:
     - JMXFETCH_URL="https://dd-jmxfetch.s3.amazonaws.com"
     - REQ_LOCALS="$TRAVIS_BUILD_DIR,$HOME/dd-agent,$HOME/integrations-extras"
     - ORACLE_DIR="$HOME/.cache/oracle"
+    - ORACLE_HOME="$ORACLE_DIR/instantclient"
     - secure: B6zL+2Zi0sjcPPSU2G0J/wxHxuQ89gA8UlrhINI13bZ6euoeMiZCr0Bhh/eXlqjezj8uawaN3ux/dQNG5/u3zMk4/HHESlaPvoxG5Gocw0nh5mhqiAuYabNDOL3YWCVw53WXpDD0f64jg6rl6be4m3gU6HYiZteKFNkC00Kndg3nL+CTSvhJVVYeLSu4R6GKdPBsKwZVSibHFg1oRnBCFHzfHoQwTxPtin6AjmKu750h0hl29sfP/vC7CErVkHtyANT/L5p6Venvz7x6gLMnx6+7vEQCAHRO1OAfzInYLHj1i8vRvKgH7QjvAJVPgToLcwxXujE5ZAEhmqdnfRf23/+7/I9Ne+l9SgOh4uRVPVe8z0Jb9fJRsw508zj1z502DBvH07Dy52JSLF9xK2zQ/5SzAUoeUre1z33WLE82KcpHGg4QJme4zXRXxVNtmdWSIa8+UT/K2M1CK30kzxHr7b7tzTK+7QBNx2mZNZUQLcHvlMTi+NGJmP212ogn+zMJ827bBZvNzLq7Rs345RAPeXja+2znfLIiguRG4wrP804hvh9fUJY0psJc85iurSW8JcGHHJwy+IUGOJYEEf55EZMaoECNiq0RU+EdABykiJiP5bAhpF530f1KfUYFX6vXVoFM4rXxDxad39+DpbQ5XRguKk+KdmUiH5Hhb7qulzU=
     - secure: pm42Zj8DnzUkbZ9Ne+HeyUzPaFj3nVMjZ2cVvtxfx3ERfJPVeXSjZSZSNagMORYNe3VngGARCutfoedokHqXC4b21rrsqNhy43wCwdyVHQQKroAfwUAS3A9mPny58LrG8RToklvGJPwHKE8Klwg4mAehK0j3jJ7OYh9hsszK+bgF9g3ygV0ZwNS7Jej8fSfAH5WOMsqAwn57doXZcrmvgwpDJDQfQuoJdEn4aQ0TYf9dSuebS9CuWTZEzUegrbjQU/EYuL3T3QBzHsG5C0efoHNgfebfRW5PAfGjfHgzD00IdB8LWlKJGxyIk6381rWLC7rQqlkMly22vv/hL/qnnhcJmvd/CpB3OgVerIqG6NVibhmK+66wKZd2j7kj9jkUyv/hcKsm7F31cAZjzN+nm6VQasgx3LD2ENI7nwqtzRIZrrbUvvTtfkXJsw65SRShhxsLkO+Tzn5bWKaOX5gR84JGpr1IRA3JS3Yal5ZaVsZefQ4bO5Ipkd8sTR7+ozetMTPy/an5IwoaK3fMzPOz1L6YeKZakrQVX0/BjSmaKRWV9PRK6r5dBIGozepWopkxiQpTvMuDVHdYSuKSkEVPlva4U1b+WyAoFF+nebPWJjIg8TQZOyYaO5vXYI6tn7UkknMWaOKC3H61x6WxhsmoszJ+wMOSVo4kuxBNZOwRt2k=
   matrix:
@@ -124,8 +125,9 @@ install:
   - pip install pexpect==4.2.1
   - mkdir -p $ORACLE_DIR
   - $TRAVIS_BUILD_DIR/oracle/ci/resources/get_instantclient.py --agree=yes
-  - echo "$ORACLE_DIR/instantclient" | sudo tee /etc/ld.so.conf.d/oracle_instantclient.conf
+  - echo "$ORACLE_HOME" | sudo tee /etc/ld.so.conf.d/oracle_instantclient.conf
   - sudo ldconfig
+  - ln -s $ORACLE_HOME/libclntsh.so.12.1 $ORACLE_HOME/libclntsh.so
 script:
   - bundle exec rake prep_travis_ci
   - bundle exec rake ci:run

oracle/check.py

@@ -3,12 +3,11 @@
 # Licensed under Simplified BSD License (see LICENSE)
 
 # stdlib
-from __future__ import print_function
 
 # 3rd party
 try:
     import cx_Oracle
-except Exception:  # not just ImportError here...
+except Exception as e:
     cx_Oracle = None
 
 # project

oracle/requirements.txt

@@ -1,2 +1,2 @@
 # integration pip requirements
-cx_Oracle==6.0
+cx_Oracle==5.3

oracle/test_oracle.py

@@ -49,8 +49,5 @@ class TestOracle(AgentCheckTest):
     CHECK_NAME = 'oracle'
 
     def testOracle(self):
-        import os
-        for k,v in os.environ.iteritems():
-            print '{}={}'.format(k,v)
         self.run_check_twice(CONFIG)
         self.coverage_report()