diff --git a/tests/fixtures/generic/cbt-multiple-rows-raw.json b/tests/fixtures/generic/cbt-multiple-rows-raw.json index d3cbc63c..c0fdde2e 100644 --- a/tests/fixtures/generic/cbt-multiple-rows-raw.json +++ b/tests/fixtures/generic/cbt-multiple-rows-raw.json @@ -1 +1 @@ -[{"key":"foo","cells":[{"column_family":"foo","column":"bar","timestamp_iso":"1970-01-01T01:00:00","timestamp_epoch":32400,"timestamp_epoch_utc":null,"value":"baz1"}]},{"key":"bar","cells":[{"column_family":"foo","column":"bar","timestamp_iso":"1970-01-01T01:00:00","timestamp_epoch":32400,"timestamp_epoch_utc":null,"value":"baz2"}]}] +[{"key":"foo","cells":[{"column_family":"foo","column":"bar","value":"baz1","timestamp_iso":"2000-01-01T01:00:00","timestamp_epoch":946717200,"timestamp_epoch_utc":null}]},{"key":"bar","cells":[{"column_family":"foo","column":"bar","value":"baz2","timestamp_iso":"2000-01-01T01:00:00","timestamp_epoch":946717200,"timestamp_epoch_utc":null}]}] diff --git a/tests/fixtures/generic/cbt-multiple-rows.out b/tests/fixtures/generic/cbt-multiple-rows.out index 686cd2b2..64ea843b 100644 --- a/tests/fixtures/generic/cbt-multiple-rows.out +++ b/tests/fixtures/generic/cbt-multiple-rows.out @@ -1,8 +1,8 @@ ---------------------------------------- foo - foo:bar @ 1970/01/01-01:00:00.000000 + foo:bar @ 2000/01/01-01:00:00.000000 "baz1" ---------------------------------------- bar - foo:bar @ 1970/01/01-01:00:00.000000 + foo:bar @ 2000/01/01-01:00:00.000000 "baz2" diff --git a/tests/test_jc_utils.py b/tests/test_jc_utils.py index 75a5611c..e32263b3 100644 --- a/tests/test_jc_utils.py +++ b/tests/test_jc_utils.py @@ -45,9 +45,9 @@ class MyTests(unittest.TestCase): # Windows english format with UTC tz (found in systeminfo cli output) '3/22/2021, 1:15:51 PM (UTC+0000)': {'string': '3/22/2021, 1:15:51 PM (UTC+0000)', 'format': 1710, 'naive': 1616444151, 'utc': 1616418951}, # Google Big Table format with no timezone: - '1970/01/01-01:00:00.000000': {'string': '1970/01/01-01:00:00.000000', 'format': 1750, 'naive': 32400, 'utc': None}, + '2000/01/01-01:00:00.000000': {'string': '2000/01/01-01:00:00.000000', 'format': 1750, 'naive': 946717200, 'utc': None}, # Google Big Table format with timezone: - '1970/01/01-01:00:00.000000+00:00': {'string': '1970/01/01-01:00:00.000000+00:00', 'format': 1755, 'naive': 32400, 'utc': 3600}, + '2000/01/01-01:00:00.000000+00:00': {'string': '2000/01/01-01:00:00.000000+00:00', 'format': 1755, 'naive': 946717200, 'utc': 946688400}, # Common Log Format '10/Oct/2000:13:55:36 -0700': {'string': '10/Oct/2000:13:55:36 -0700', 'format': 1800, 'naive': 971211336, 'utc': None}, '10/Oct/2000:13:55:36 -0000': {'string': '10/Oct/2000:13:55:36 -0000', 'format': 1800, 'naive': 971211336, 'utc': 971186136},