Fix _get_hash in splay executor

You can't pass a unicode value to bytearray()

salt/executors/splay.py

@@ -7,6 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals
 import time
 import logging
 
+import salt.utils.stringutils
+
 log = logging.getLogger(__name__)
 
 _DEFAULT_SPLAYTIME = 300
@@ -28,7 +30,7 @@ def _get_hash():
     bitmask = 0xffffffff
     h = 0
 
-    for i in bytearray(__grains__['id']):
+    for i in bytearray(salt.utils.stringutils.to_bytes(__grains__['id'])):
         h = (h + i) & bitmask
         h = (h + (h << 10)) & bitmask
         h = (h ^ (h >> 6)) & bitmask

tests/unit/executors/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

tests/unit/executors/test_splay.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+# Import Salt libs
+from tests.support.mixins import LoaderModuleMockMixin
+from tests.support.unit import TestCase
+
+import salt.executors.splay as splay_exec
+
+
+class SplayTestCase(TestCase, LoaderModuleMockMixin):
+
+    def setup_loader_modules(self):
+        return {
+            splay_exec: {
+                '__grains__': {'id': 'foo'},
+            }
+        }
+
+    def test__get_hash(self):
+        # We just want to make sure that this function does not result in an
+        # error due to passing a unicode value to bytearray()
+        assert splay_exec._get_hash()