Merge branch '2016.3' into '2016.11'

No conflicts.

doc/topics/development/tests/index.rst

@@ -110,23 +110,8 @@ On Debian, Ubuntu or their derivatives run the following commands:
 This will install the latest ``pycrypto`` and ``pyzmq`` (with bundled
 ``libzmq``) Python modules required for running integration tests suite.
 
-.. note::
-
-    In Salt 0.17, testing libraries were migrated into their own repo. To install them:
-
-    .. code-block:: bash
-
-        pip install git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting
-
-
-    Failure to install SaltTesting will result in import errors similar to the following:
-
-    .. code-block:: bash
-
-        ImportError: No module named salttesting
-
-Once all requirements are installed, use ``tests/runtests.py`` to
-run all of the tests included in Salt's test suite:
+Once all requirements are installed, use ``runtests.py`` script to run all of
+the tests included in Salt's test suite:
 
 .. code-block:: bash
 

requirements/dev_python27.txt

@@ -1,6 +1,8 @@
 -r base.txt
 
 mock
+apache-libcloud>=0.14.0
 boto>=2.32.1
+boto3>=1.2.1
 moto>=0.3.6
 SaltTesting==2015.2.16

requirements/dev_python34.txt

@@ -1,6 +1,8 @@
 -r base.txt
 
 mock
+apache-libcloud>=0.14.0
 boto>=2.32.1
+boto3>=1.2.1
 moto>=0.3.6
 SaltTesting>=2015.2.16

salt/config/__init__.py

@@ -3445,6 +3445,10 @@ def api_config(path):
         'pidfile': opts.get('api_pidfile', DEFAULT_API_OPTS['api_pidfile']),
     })
     opts.update(api_opts)
+    prepend_root_dir(opts, [
+        'api_pidfile',
+        'api_logfile',
+    ])
     return opts
 
 

salt/netapi/rest_cherrypy/app.py

@@ -919,12 +919,12 @@ cherrypy.tools.html_override = cherrypy.Tool('on_start_resource',
         html_override_tool, priority=53)
 cherrypy.tools.salt_token = cherrypy.Tool('on_start_resource',
         salt_token_tool, priority=55)
+cherrypy.tools.cors_tool = cherrypy.Tool('before_request_body',
+        cors_tool, priority=50)
 cherrypy.tools.salt_auth = cherrypy.Tool('before_request_body',
         salt_auth_tool, priority=60)
 cherrypy.tools.hypermedia_in = cherrypy.Tool('before_request_body',
         hypermedia_in)
-cherrypy.tools.cors_tool = cherrypy.Tool('before_request_body',
-        cors_tool, priority=30)
 cherrypy.tools.lowdata_fmt = cherrypy.Tool('before_handler',
         lowdata_fmt, priority=40)
 cherrypy.tools.hypermedia_out = cherrypy.Tool('before_handler',

tests/unit/modules/tls_test.py

@@ -273,7 +273,21 @@ class TLSAddTestCase(TestCase):
                 del source['extensions']
         with patch('salt.utils.fopen',
                    mock_open(read_data=_TLS_TEST_DATA['ca_cert'])):
-            result = ignore_extensions(tls.cert_info(certp))
+            try:
+                result = ignore_extensions(tls.cert_info(certp))
+            except AttributeError as err:
+                # PyOpenSSL version 16.0.0 has an upstream bug in it where a call is made
+                # in OpenSSL/crypto.py in the get_signature_algorithm function referencing
+                # the cert_info attribute, which doesn't exist. This was fixed in subsequent
+                # releases of PyOpenSSL with https://github.com/pyca/pyopenssl/pull/476
+                if '\'_cffi_backend.CDataGCP\' object has no attribute \'cert_info\'' == str(err):
+                    self.skipTest(
+                        'Encountered an upstream error with PyOpenSSL: {0}'.format(
+                            err
+                        )
+                    )
+                result = {}
+
         remove_not_in_result(ret, result)
         self.assertEqual(result, ret)