Merge pull request #41752 from rallytime/merge-develop

[develop] Merge forward from 2017.7 to develop

doc/topics/tutorials/firewall.rst

@@ -93,6 +93,50 @@ firewall.
 
 .. _linux-iptables:
 
+
+Windows
+=======
+
+Windows Firewall is the default component of Microsoft Windows that provides
+firewalling and packet filtering. There are many 3rd party firewalls available
+for Windows, some of which use rules from the Windows Firewall. If you are
+experiencing problems see the vendor's specific documentation for opening the
+required ports.
+
+The Windows Firewall can be configured using the Windows Interface or from the
+command line.
+
+**Windows Firewall (interface)**:
+
+1. Open the Windows Firewall Interface by typing ``wf.msc`` at the command
+   prompt or in a run dialog (*Windows Key + R*)
+
+2. Navigate to **Inbound Rules** in the console tree
+
+3. Add a new rule by clicking **New Rule...** in the Actions area
+
+4. Change the Rule Type to **Port**. Click **Next**
+
+5. Set the Protocol to **TCP** and specify local ports **4505-4506**. Click
+   **Next**
+
+6. Set the Action to **Allow the connection**. Click **Next**
+
+7. Apply the rule to **Domain**, **Private**, and **Public**. Click **Next**
+
+8. Give the new rule a Name, ie: **Salt**. You may also add a description. Click
+   **Finish**
+
+**Windows Firewall (command line)**:
+
+The Windows Firewall rule can be created by issuing a single command. Run the
+following command from the command line or a run prompt:
+
+.. code-block:: cmd
+
+    netsh advfirewall firewall add rule name="Salt" dir=in action=allow protocol=TCP localport=4505-4506
+
+
 iptables
 ========
 
@@ -188,4 +232,4 @@ be set on the Master:
     ``salt-master`` on the *loopback* interface. Without this you will
     see no outgoing Salt traffic from the master, even for a simple
     ``salt '*' test.ping``, because the ``salt`` client never reached
-    the ``salt-master`` to tell it to carry out the execution.
+    the ``salt-master`` to tell it to carry out the execution.

tests/unit/transport/test_tcp.py

@@ -20,7 +20,7 @@ import salt.exceptions
 
 # Import Salt Testing libs
 from tests.support.unit import TestCase, skipIf
-from tests.support.helpers import get_unused_localhost_port
+from tests.support.helpers import get_unused_localhost_port, flaky
 from tests.support.mixins import AdaptedConfigurationTestCaseMixin
 from tests.unit.transport.mixins import PubChannelMixin, ReqChannelMixin
 
@@ -134,6 +134,7 @@ class AESReqTestCases(BaseTCPReqCase, ReqChannelMixin):
 
     # TODO: make failed returns have a specific framing so we can raise the same exception
     # on encrypted channels
+    @flaky
     def test_badload(self):
         '''
         Test a variety of bad requests, make sure that we get some sort of error