move make_msg

mambocab · mambocab · commit d324e37a6ca3 · 2018-01-19T15:20:45.000-05:00
diff --git a/tests/unit/io/test_asyncorereactor.py b/tests/unit/io/test_asyncorereactor.py
@@ -28,7 +28,7 @@
 from cassandra.connection import ConnectionException, ProtocolError
 from cassandra.io.asyncorereactor import AsyncoreConnection
 from cassandra.protocol import (SupportedMessage, ReadyMessage, ServerError)
-from cassandra.marshal import uint32_pack, int32_pack
+from cassandra.marshal import int32_pack
 from tests import is_monkey_patched
 from tests.unit.io.utils import submit_and_wait_for_completion, TimerCallback, ReactorTestMixin
 
@@ -61,9 +61,6 @@ def setUp(self):
         if is_monkey_patched():
             raise unittest.SkipTest("Can't test asyncore with monkey patching")
 
-    def make_msg(self, header, body=six.binary_type()):
-        return header + uint32_pack(len(body)) + body
-
     def test_successful_connection(self):
         c = self.make_connection()
 
diff --git a/tests/unit/io/test_libevreactor.py b/tests/unit/io/test_libevreactor.py
@@ -26,7 +26,7 @@
 
 from cassandra.connection import ConnectionException, ProtocolError
 from cassandra.protocol import (SupportedMessage, ReadyMessage, ServerError)
-from cassandra.marshal import uint32_pack, int32_pack
+from cassandra.marshal import int32_pack
 
 from tests import is_monkey_patched
 from tests.unit.io.utils import ReactorTestMixin
@@ -51,8 +51,6 @@ def setUp(self):
             raise unittest.SkipTest('libev does not appear to be installed correctly')
         LibevConnection.initialize_reactor()
 
-    def make_msg(self, header, body=six.binary_type()):
-        return header + uint32_pack(len(body)) + body
         # we patch here rather than as a decorator so that the Mixin can avoid
         # specifying patch args to test methods
         patchers = [patch(obj) for obj in
diff --git a/tests/unit/io/utils.py b/tests/unit/io/utils.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from cassandra.connection import HEADER_DIRECTION_TO_CLIENT
-from cassandra.marshal import uint8_pack
+from cassandra.marshal import uint8_pack, uint32_pack
 from cassandra.protocol import write_stringmultimap, write_int, write_string
 
 from six import binary_type, BytesIO
@@ -180,3 +180,6 @@ def make_error_body(self, code, msg):
         write_int(buf, code)
         write_string(buf, msg)
         return buf.getvalue()
+
+    def make_msg(self, header, body=binary_type()):
+        return header + uint32_pack(len(body)) + body
