Add some blob columns to the tests

Author: alexmoore

riak/tests/test_timeseries_pbuf.py

@@ -21,6 +21,8 @@
 bd0 = '时间序列'
 bd1 = 'временные ряды'
 
+blob0 = b'\x00\x01\x02\x03\x04\x05\x06\x07'
+
 fiveMins = datetime.timedelta(0, 300)
 # NB: last arg is microseconds, 987ms expressed
 ts0 = datetime.datetime(2015, 1, 1, 12, 0, 0, 987000)
@@ -46,8 +48,8 @@ def setUpClass(cls):
                 'expected {:d} to equal {:d}'.format(cls.ts1ms, ex1ms))
 
         cls.rows = [
-            [bd0, 0, 1.2, ts0, True, bd0],
-            [bd1, 3, 4.5, ts1, False, bd1]
+            [bd0, 0, 1.2, ts0, True, None],
+            [bd1, 3, 4.5, ts1, False, blob0]
         ]
         cls.test_key = ['hash1', 'user2', ts0]
         cls.table = Table(None, table_name)
@@ -99,8 +101,7 @@ def test_encode_data_for_put(self):
         self.assertEqual(r0.cells[2].double_value, self.rows[0][2])
         self.assertEqual(r0.cells[3].timestamp_value, self.ts0ms)
         self.assertEqual(r0.cells[4].boolean_value, self.rows[0][4])
-        self.assertEqual(bytes_to_str(r0.cells[5].varchar_value),
-                         self.rows[0][5])
+        self.assertEqual(r0.cells[5].varchar_value, self.rows[0][5])
 
         r1 = req.rows[1]
         self.assertEqual(bytes_to_str(r1.cells[0].varchar_value),
@@ -109,8 +110,7 @@ def test_encode_data_for_put(self):
         self.assertEqual(r1.cells[2].double_value, self.rows[1][2])
         self.assertEqual(r1.cells[3].timestamp_value, self.ts1ms)
         self.assertEqual(r1.cells[4].boolean_value, self.rows[1][4])
-        self.assertEqual(bytes_to_str(r1.cells[5].varchar_value),
-                         self.rows[1][5])
+        self.assertEqual(r1.cells[5].varchar_value, self.rows[1][5])
 
     def test_encode_data_for_listkeys(self):
         c = PbufCodec(client_timeouts=True)
@@ -154,7 +154,6 @@ def test_decode_data_from_query(self):
         r0c4 = r0.cells.add()
         r0c4.boolean_value = self.rows[0][4]
         r0c5 = r0.cells.add()
-        r0c5.varchar_value = str_to_bytes(self.rows[0][5])
 
         r1 = tqr.rows.add()
         r1c0 = r1.cells.add()
@@ -168,7 +167,7 @@ def test_decode_data_from_query(self):
         r1c4 = r1.cells.add()
         r1c4.boolean_value = self.rows[1][4]
         r1c5 = r1.cells.add()
-        r1c5.varchar_value = str_to_bytes(self.rows[1][5])
+        r1c5.varchar_value = self.rows[1][5]
 
         tsobj = TsObject(None, self.table)
         c = PbufCodec()
@@ -198,15 +197,15 @@ def test_decode_data_from_query(self):
         self.assertEqual(r0[2], self.rows[0][2])
         self.assertEqual(r0[3], ts0)
         self.assertEqual(r0[4], self.rows[0][4])
-        self.assertEqual(bytes_to_str(r0[5]), self.rows[0][5])
+        self.assertEqual(r0[5], self.rows[0][5])
 
         r1 = tsobj.rows[1]
         self.assertEqual(bytes_to_str(r1[0]), self.rows[1][0])
         self.assertEqual(r1[1], self.rows[1][1])
         self.assertEqual(r1[2], self.rows[1][2])
         self.assertEqual(r1[3], ts1)
         self.assertEqual(r1[4], self.rows[1][4])
-        self.assertEqual(bytes_to_str(r1[5]), self.rows[1][5])
+        self.assertEqual(r1[5], self.rows[1][5])
 
 
 @unittest.skipUnless(is_timeseries_supported() and RUN_TIMESERIES,

riak/tests/test_timeseries_ttb.py

@@ -36,6 +36,8 @@
 bd0 = six.u('时间序列')
 bd1 = six.u('временные ряды')
 
+blob0 = b'\x00\x01\x02\x03\x04\x05\x06\x07'
+
 fiveMins = datetime.timedelta(0, 300)
 ts0 = datetime.datetime(2015, 1, 1, 12, 1, 2, 987000)
 ts1 = ts0 + fiveMins
@@ -62,20 +64,20 @@ def test_encode_data_for_get(self):
     # {tsgetresp,
     #   {
     #     [<<"geohash">>, <<"user">>, <<"time">>,
-    #      <<"weather">>, <<"temperature">>],
-    #     [varchar, varchar, timestamp, varchar, double],
-    #     [(<<"hash1">>, <<"user2">>, 144378190987, <<"typhoon">>, 90.3)]
+    #      <<"weather">>, <<"temperature">>, <<"blob">>],
+    #     [varchar, varchar, timestamp, varchar, double, blob],
+    #     [(<<"hash1">>, <<"user2">>, 144378190987, <<"typhoon">>, 90.3, <<0,1,2,3,4,5,6,7>>)]
     #   }
     # }
     def test_decode_data_from_get(self):
         colnames = ["varchar", "sint64", "double", "timestamp",
-                    "boolean", "varchar", "varchar"]
+                    "boolean", "varchar", "varchar", "blob"]
         coltypes = [varchar_a, sint64_a, double_a, timestamp_a,
                     boolean_a, varchar_a, varchar_a]
         r0 = (bd0, 0, 1.2, unix_time_millis(ts0), True,
-              [], str1, None)
+              [], str1, None, None)
         r1 = (bd1, 3, 4.5, unix_time_millis(ts1), False,
-              [], str1, None)
+              [], str1, None, blob0)
         rows = [r0, r1]
         # { tsgetresp, { [colnames], [coltypes], [rows] } }
         data_t = colnames, coltypes, rows
@@ -102,6 +104,7 @@ def test_decode_data_from_get(self):
             self.assertEqual(r[5], None)
             self.assertEqual(r[6], dr[6].encode('ascii'))
             self.assertEqual(r[7], None)
+            self.assertEqual(r[8], dr[8])
 
     def test_encode_data_for_put(self):
         r0 = (bd0, 0, 1.2, unix_time_millis(ts0), True, [])