From 3fd63c6886e5e7cba702a4487875865d48024327 Mon Sep 17 00:00:00 2001 From: pavel-paulau Date: Tue, 15 Jan 2013 17:08:57 +0300 Subject: [PATCH] CBD-672: fix broken flags in unit tests The same issue - f75b10e3a11e41b28568dde028a4284efdab084d Change-Id: I8cf9546a6e5f2efd5fcb598355aaf6b4937ef9df Reviewed-on: http://review.couchbase.org/23950 Tested-by: Pavel Paulau Reviewed-by: Steve Yen --- t/pump_test.py | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/t/pump_test.py b/t/pump_test.py index b75ef63..b4a0c27 100644 --- a/t/pump_test.py +++ b/t/pump_test.py @@ -676,6 +676,7 @@ def expect_backup_contents(self, backup_dir, expected_msg acmd, avbucket_id, akey, aflg, aexp, acas, ameta, aval = \ actual_msg + eflg = socket.ntohl(eflg) self.assertEqual(ecmd, acmd) self.assertEqual(evbucket_id, avbucket_id) @@ -1037,12 +1038,12 @@ def test_2_mutation(self): "-x", "max_retry=0"]) self.assertEqual(0, rv) self.check_cbb_file_exists(d, num=2) - # 0xfedcba01 == 4275878401, using high numbers to check endianess. + # 0xfedcba01 == 4275878401 == 29023486L, using high numbers to check endianess. # 0xffeedd00 == 4293844224 self.expect_backup_contents(d, - "set a 4275878401 0 1\r\nA\r\n" + "set a 29023486 0 1\r\nA\r\n" "set b 0 4293844224 1\r\nB\r\n" - "set a 4275878401 0 1\r\nA\r\n" + "set a 29023486 0 1\r\nA\r\n" "set b 0 4293844224 1\r\nB\r\n", [(CMD_TAP_MUTATION, 123, 'a', 0xfedcba01, 0, 321, '', 'A'), (CMD_TAP_MUTATION, 1234, 'b', 0, 0xffeedd00, 4321, '', 'B'), @@ -1109,10 +1110,10 @@ def test_key_filter_some(self): rv = pump_transfer.Backup().main(["cbbackup", mrs.url(), d, "-k", "a"]) self.assertEqual(0, rv) self.check_cbb_file_exists(d, num=2) - # 0xfedcba01 == 4275878401 + # 0xfedcba01 == 4275878401 == 29023486L self.expect_backup_contents(d, - "set a 4275878401 0 1\r\nA\r\n" - "set a 4275878401 0 1\r\nA\r\n", + "set a 29023486 0 1\r\nA\r\n" + "set a 29023486 0 1\r\nA\r\n", [(CMD_TAP_MUTATION, 123, 'a', 0xfedcba01, 0, 321, '', 'A'), (CMD_TAP_MUTATION, 123, 'a', 0xfedcba01, 0, 321, '', 'A')]) w.join() @@ -1250,10 +1251,10 @@ def test_delete(self): self.assertEqual(0, rv) self.check_cbb_file_exists(d, num=2) self.expect_backup_contents(d, - "set a 40302010 0 1\r\nA\r\n" + "set a 3136644610 0 1\r\nA\r\n" "delete a\r\n" "set b 0 12345 1\r\nB\r\n" - "set a 40302010 0 1\r\nA\r\n" + "set a 3136644610 0 1\r\nA\r\n" "delete a\r\n" "set b 0 12345 1\r\nB\r\n", [(CMD_TAP_MUTATION, 123, 'a', 40302010, 0, 321, '', 'A'), @@ -1328,9 +1329,9 @@ def test_delete_ack(self): self.assertEqual(0, rv) self.check_cbb_file_exists(d, num=2) self.expect_backup_contents(d, - "set a 40302010 0 1\r\nA\r\n" + "set a 3136644610 0 1\r\nA\r\n" "delete a\r\n" - "set a 40302010 0 1\r\nA\r\n" + "set a 3136644610 0 1\r\nA\r\n" "delete a\r\n", [(CMD_TAP_MUTATION, 123, 'a', 40302010, 0, 321, '', 'A'), (CMD_TAP_DELETE, 111, 'a', 0, 0, 333, '', ''), @@ -1398,10 +1399,10 @@ def test_noop(self): self.assertEqual(0, rv) self.check_cbb_file_exists(d, num=2) self.expect_backup_contents(d, - "set a 40302010 0 1\r\nA\r\n" + "set a 3136644610 0 1\r\nA\r\n" "delete a\r\n" "set b 0 12345 1\r\nB\r\n" - "set a 40302010 0 1\r\nA\r\n" + "set a 3136644610 0 1\r\nA\r\n" "delete a\r\n" "set b 0 12345 1\r\nB\r\n", [(CMD_TAP_MUTATION, 123, 'a', 40302010, 0, 321, '', 'A'), @@ -1486,10 +1487,10 @@ def test_tap_cmd_opaque(self): self.assertEqual(0, rv) self.check_cbb_file_exists(d, num=2) self.expect_backup_contents(d, - "set a 40302010 0 1\r\nA\r\n" + "set a 3136644610 0 1\r\nA\r\n" "delete a\r\n" "set b 0 12345 0\r\n\r\n" - "set a 40302010 0 1\r\nA\r\n" + "set a 3136644610 0 1\r\nA\r\n" "delete a\r\n" "set b 0 12345 0\r\n\r\n", [(CMD_TAP_MUTATION, 123, 'a', 40302010, 0, 321, '', 'A'), @@ -1588,8 +1589,8 @@ def test_flush_all(self): self.assertEqual(0, rv) self.check_cbb_file_exists(d, num=2) self.expect_backup_contents(d, - "set a 40302010 0 1\r\nA\r\n" - "set a 40302010 0 1\r\nA\r\n", + "set a 3136644610 0 1\r\nA\r\n" + "set a 3136644610 0 1\r\nA\r\n", [(CMD_TAP_MUTATION, 123, 'a', 40302010, 0, 321, '', 'A'), (CMD_TAP_MUTATION, 123, 'a', 40302010, 0, 321, '', 'A')]) w.join() @@ -1660,13 +1661,13 @@ def gen_backup(self, [(CMD_TAP_MUTATION, 900, 'x', 'X', 0xfe000000, 9900, 8800, ''), (CMD_TAP_MUTATION, 901, 'y', 'Y', 0xfe000001, 9901, 8801, '')] ] - # 0xf1000000 == 4043309056 - # 0xfe000000 == 4261412864 + # 0xf1000000 == 4043309056 == 241L + # 0xfe000000 == 4261412864 == 254L expected_backup_stdout = \ - "set a 4043309056 1000 1\r\nA\r\n" \ - "set b 4043309057 1001 1\r\nB\r\n" \ - "set x 4261412864 9900 1\r\nX\r\n" \ - "set y 4261412865 9901 1\r\nY\r\n" + "set a 241 1000 1\r\nA\r\n" \ + "set b 16777457 1001 1\r\nB\r\n" \ + "set x 254 9900 1\r\nX\r\n" \ + "set y 16777470 9901 1\r\nY\r\n" if not json: json = self.json_2_nodes() @@ -1714,6 +1715,7 @@ def flatten_msgs_per_node(self, msgs_per_node): arr = [] for msg in flattened: cmd_tap, vbucket_id, key, val, flg, exp, cas, meta = msg + flg = socket.ntohl(flg) arr.append((cmd_tap, vbucket_id, key, val, flg, exp, 0, meta)) return arr