Merge pull request #188 from splunk/updateTravisCI

Update travis ci

Author: ljiang1

.travis.yml

@@ -30,14 +30,13 @@ before_install:
     - mkdir -p $SPLUNK_HOME/var/log/splunk
 
 env:
-    - SPLUNK_VERSION=6.4-sdk
-    - SPLUNK_VERSION=6.5-sdk
+    - SPLUNK_VERSION=6.6-sdk
+    - SPLUNK_VERSION=7.0-sdk
 
 language: python
 
 python:
   - "2.7"
-  - "2.6"
 
 install: "pip install unittest2"
 

README.md

@@ -36,7 +36,7 @@ Here's what you need to get going with the Splunk SDK for Python.
 
 #### Python
 
-The Splunk SDK for Python requires Python 2.6+. 
+The Splunk SDK for Python requires Python 2.7+. 
 
 #### Splunk
 
@@ -168,9 +168,7 @@ prompt in the **/splunk-sdk-python/tests** subdirectory and enter:
     python test_app.py
 
 The test suite uses Python's standard library and the built-in `unittest` 
-library. If you're using Python 2.7, you're all set. However, if you are using 
-Python 2.6, you'll also need to install the `unittest2` library to
-get the additional features that were added to Python 2.7.
+library. 
 
 You can read more about our testing framework on
 [GitHub](https://github.com/splunk/splunk-sdk-python/tree/master/tests).
@@ -315,7 +313,3 @@ You can reach the Developer Platform team at [email protected]_.
 The Splunk Software Development Kit for Python is licensed under the Apache
 License 2.0. Details can be found in the file LICENSE.
 
-For compatibility with Python 2.6, The Splunk Software Development Kit
-for Python ships with ordereddict.py from the ordereddict package on
-[PyPI](http://pypi.python.org/pypi/ordereddict/1.1), which is licensed
-under the MIT license (see the top of splunklib/ordereddict.py).

examples/handlers/cacert.pem

@@ -1,16 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIICdTCCAd4CCQDlsvzBaZf1RjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJV
+MIIDejCCAmICCQCNHBN8tj/FwzANBgkqhkiG9w0BAQsFADB/MQswCQYDVQQGEwJV
 UzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDzANBgNVBAoM
 BlNwbHVuazEXMBUGA1UEAwwOU3BsdW5rQ29tbW9uQ0ExITAfBgkqhkiG9w0BCQEW
-EnN1cHBvcnRAc3BsdW5rLmNvbTAeFw0xNTA1MTExOTUxMzdaFw0yNTA1MDgxOTUx
-MzdaMH8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZy
+EnN1cHBvcnRAc3BsdW5rLmNvbTAeFw0xNzAxMzAyMDI2NTRaFw0yNzAxMjgyMDI2
+NTRaMH8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZy
 YW5jaXNjbzEPMA0GA1UECgwGU3BsdW5rMRcwFQYDVQQDDA5TcGx1bmtDb21tb25D
-QTEhMB8GCSqGSIb3DQEJARYSc3VwcG9ydEBzcGx1bmsuY29tMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQDJmb55yvam1GqGgTK0dfHXWJiB0Fh8fsdJFRc5dxBJ
-PFaC/klmtbLFLbYuXdC2Jh4cm/uhj1/FWmA0Wbhb02roAV03Z3SX0pHyFa3Udyqr
-9f5ERJ0AYFA+y5UhbMnD9zlhs7J8ucub3XvA8rn79ejkYtDX2rMQWPNZYPcrxUEh
-iwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFd9dzyyb2wnlDy3tlFVH2BUXdJZPKIC
-E3VyMsPTNhXDq7ESVWBLJeUQh6uJ1A3QyLrtTqG/1h62vvP+UxAw4THZ4g3a2i65
-3T1q78dhq1cKneOuE83Te/fREH54QokzrnAXoz+v/aGJkzjEpSEwrWUwLA1koE8I
-/0XFEwxWbEbt
+QTEhMB8GCSqGSIb3DQEJARYSc3VwcG9ydEBzcGx1bmsuY29tMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzB9ltVEGk73QvPlxXtA0qMW/SLDQlQMFJ/C/
+tXRVJdQsmcW4WsaETteeWZh8AgozO1LqOa3I6UmrWLcv4LmUAh/T3iZWXzHLIqFN
+WLSVU+2g0Xkn43xSgQEPSvEK1NqZRZv1SWvx3+oGHgu03AZrqTj0HyLujqUDARFX
+sRvBPW/VfDkomHj9b8IuK3qOUwQtIOUr+oKx1tM1J7VNN5NflLw9NdHtlfblw0Ys
+5xI5Qxu3rcCxkKQuwz9KRe4iijOIRMAKX28pbakxU9Nk38Ac3PNadgIk0s7R829k
+980sqGWkd06+C17OxgjpQbvLOR20FtmQybttUsXGR7Bp07YStwIDAQABMA0GCSqG
+SIb3DQEBCwUAA4IBAQCxhQd6KXP2VzK2cwAqdK74bGwl5WnvsyqdPWkdANiKksr4
+ZybJZNfdfRso3fA2oK1R8i5Ca8LK3V/UuAsXvG6/ikJtWsJ9jf+eYLou8lS6NVJO
+xDN/gxPcHrhToGqi1wfPwDQrNVofZcuQNklcdgZ1+XVuotfTCOXHrRoNmZX+HgkY
+gEtPG+r1VwSFowfYqyFXQ5CUeRa3JB7/ObF15WfGUYplbd3wQz/M3PLNKLvz5a1z
+LMNXDwN5Pvyb2epyO8LPJu4dGTB4jOGpYLUjG1UUqJo9Oa6D99rv6sId+8qjERtl
+ZZc1oaC0PKSzBmq+TpbR27B8Zra3gpoA+gavdRZj
 -----END CERTIFICATE-----

tests/test_binding.py

@@ -506,6 +506,7 @@ def setUp(self):
         import splunklib.client as client
         service = client.Service(**self.opts.kwargs)
         # TODO: Workaround the fact that skipTest is not defined by unittest2.TestCase
+        service.login()
         splver = service.splunk_version
         if splver[:2] < (6, 2):
             self.skipTest("Skipping cookie-auth tests, running in %d.%d.%d, this feature was added in 6.2+" % splver)

tests/test_service.py

@@ -158,12 +158,7 @@ def test_query_without_login_raises_http_401(self):
                 pass
             else:
                 raise
-    
-    def test_server_info_without_login(self):
-        service = self._create_unauthenticated_service()
-        # Should succeed without AuthenticationError
-        service.info['version']
-    
+
     def _create_unauthenticated_service(self):
         return Service(**{
             'host': self.opts.kwargs['host'],
@@ -177,12 +172,6 @@ def setUp(self):
         self.opts = testlib.parse([], {}, ".splunkrc")
         self.service = client.Service(**self.opts.kwargs)
 
-        # Skip these tests if running below Splunk 6.2, cookie-auth didn't exist before
-        splver = self.service.splunk_version
-        # TODO: Workaround the fact that skipTest is not defined by unittest2.TestCase
-        if splver[:2] < (6, 2):
-            self.skipTest("Skipping cookie-auth tests, running in %d.%d.%d, this feature was added in 6.2+" % splver)
-
     if getattr(unittest.TestCase, 'assertIsNotNone', None) is None:
 
         def assertIsNotNone(self, obj, msg=None):