Added check for not mixing unix socket and sockets parameters

2 files changed, 12 insertions, 0 deletions

diff --git a/waitress/adjustments.py b/waitress/adjustments.py
index c92ba5b..84e4d4a 100644
--- a/waitress/adjustments.py
+++ b/waitress/adjustments.py
@@ -237,6 +237,9 @@ class Adjustments(object):
         if 'sockets' in kw and ('host' in kw or 'port' in kw):
             raise ValueError('host and or port may not be set if sockets is set.')
 
+        if 'sockets' in kw and 'unix_socket' in kw:
+            raise ValueError('unix_socket may not be set if sockets is set')
+
         for k, v in kw.items():
             if k not in self._param_map:
                 raise ValueError('Unknown adjustment %r' % k)
diff --git a/waitress/tests/test_adjustments.py b/waitress/tests/test_adjustments.py
index 64efcf0..dd597df 100644
--- a/waitress/tests/test_adjustments.py
+++ b/waitress/tests/test_adjustments.py
@@ -263,6 +263,15 @@ class TestAdjustments(unittest.TestCase):
             sockets=sockets)
         sockets[0].close()
 
+    def test_dont_mix_sockets_and_unix_socket(self):
+        sockets = [socket.socket(socket.AF_INET, socket.SOCK_STREAM)]
+        self.assertRaises(
+            ValueError,
+            self._makeOne,
+            unix_socket='./tmp',
+            sockets=sockets)
+        sockets[0].close()
+
     def test_badvar(self):
         self.assertRaises(ValueError, self._makeOne, nope=True)