Merge pull request pandas-dev#85 from manahl/fix-incorrect-unittests

Unit tests need to be prefixed with test_

Author: bmoscon

tests/integration/tickstore/test_toplevel.py

@@ -26,7 +26,7 @@
                           (dt(2009, 2, 1), dt(2009, 12, 31), []),
                           (dt(2013, 2, 1), dt(2013, 12, 31), []),
                           ])
-def should_return_libraries_for_the_given_daterange(toplevel_tickstore, start, end, expected):
+def test_should_return_libraries_for_the_given_daterange(toplevel_tickstore, start, end, expected):
     toplevel_tickstore._collection.insert_one({'start': dt(2010, 1, 1),
                                            'end': dt(2010, 12, 31, 23, 59, 59),
                                            'library_name': 'FEED_2010.LEVEL1'})
@@ -40,7 +40,7 @@ def should_return_libraries_for_the_given_daterange(toplevel_tickstore, start, e
     assert libraries == expected
 
 
-def should_raise_exceptions_if_no_libraries_are_found_in_the_date_range_when_reading_data(toplevel_tickstore):
+def test_should_raise_exceptions_if_no_libraries_are_found_in_the_date_range_when_reading_data(toplevel_tickstore):
     toplevel_tickstore._collection.insert_one({'start': dt(2010, 1, 1),
                                            'end': dt(2010, 12, 31, 23, 59, 59),
                                            'library_name': 'FEED_2010.LEVEL1'})
@@ -49,24 +49,26 @@ def should_raise_exceptions_if_no_libraries_are_found_in_the_date_range_when_rea
     assert "No underlying libraries exist for the given date range" in str(e)
 
 
-def should_return_data_when_date_range_falls_in_a_single_underlying_library(toplevel_tickstore, arctic):
+@pytest.mark.xfail
+def test_should_return_data_when_date_range_falls_in_a_single_underlying_library(toplevel_tickstore, arctic):
     arctic.initialize_library('FEED_2010.LEVEL1', tickstore.TICK_STORE_TYPE)
-    tickstore = arctic['FEED_2010.LEVEL1']
+    tstore = arctic['FEED_2010.LEVEL1']
     arctic.initialize_library('test_current.toplevel_tickstore', tickstore.TICK_STORE_TYPE)
     tickstore_current = arctic['test_current.toplevel_tickstore']
     toplevel_tickstore._collection.insert_one({'start': dt(2010, 1, 1),
                                            'end': dt(2010, 12, 31, 23, 59, 59),
                                            'library_name': 'FEED_2010.LEVEL1'})
     dates = pd.date_range('20100101', periods=6, tz=mktz('Europe/London'))
     df = pd.DataFrame(np.random.randn(6, 4), index=dates, columns=list('ABCD'))
-    tickstore.write('blah', df)
+    tstore.write('blah', df)
     tickstore_current.write('blah', df)
     res = toplevel_tickstore.read('blah', DateRange(start=dt(2010, 1, 1), end=dt(2010, 1, 6)), list('ABCD'))
 
-    assert_frame_equal(df, res.tz_localize(mktz('Europe/London')))
+    assert_frame_equal(df, res.tz_convert(mktz('Europe/London')))
 
 
-def should_return_data_when_date_range_spans_libraries(toplevel_tickstore, arctic):
+@pytest.mark.xfail
+def test_should_return_data_when_date_range_spans_libraries(toplevel_tickstore, arctic):
     arctic.initialize_library('FEED_2010.LEVEL1', tickstore.TICK_STORE_TYPE)
     arctic.initialize_library('FEED_2011.LEVEL1', tickstore.TICK_STORE_TYPE)
     tickstore_2010 = arctic['FEED_2010.LEVEL1']
@@ -85,30 +87,31 @@ def should_return_data_when_date_range_spans_libraries(toplevel_tickstore, arcti
     tickstore_2011.write('blah', df_11)
     res = toplevel_tickstore.read('blah', DateRange(start=dt(2010, 1, 2), end=dt(2011, 1, 4)), list('ABCD'))
     expected_df = pd.concat([df_10[1:], df_11[:4]])
-    assert_frame_equal(expected_df, res.tz_localize(mktz('Europe/London')))
+    assert_frame_equal(expected_df, res.tz_convert(mktz('Europe/London')))
 
 
-def should_add_underlying_library_where_none_exists(toplevel_tickstore, arctic):
+def test_should_add_underlying_library_where_none_exists(toplevel_tickstore, arctic):
     arctic.initialize_library('FEED_2010.LEVEL1', tickstore.TICK_STORE_TYPE)
     toplevel_tickstore.add(DateRange(start=dt(2010, 1, 1), end=dt(2010, 12, 31, 23, 59, 59, 999000)), 'FEED_2010.LEVEL1')
     assert toplevel_tickstore._collection.find_one({'library_name': 'FEED_2010.LEVEL1'})
 
 
-def should_add_underlying_library_where_another_library_exists_in_a_non_overlapping_daterange(toplevel_tickstore, arctic):
+@pytest.mark.xfail
+def test_should_add_underlying_library_where_another_library_exists_in_a_non_overlapping_daterange(toplevel_tickstore, arctic):
     toplevel_tickstore._collection.insert_one({'library_name': 'FEED_2011.LEVEL1', 'start': dt(2011, 1, 1), 'end': dt(2011, 12, 31)})
     arctic.initialize_library('FEED_2010.LEVEL1', tickstore.TICK_STORE_TYPE)
     toplevel_tickstore.add(DateRange(start=dt(2010, 1, 1), end=dt(2010, 12, 31, 23, 59, 59, 999000)), 'FEED_2010.LEVEL1')
     assert set([ res['library_name'] for res in toplevel_tickstore._collection.find()]) == set(['FEED_2010.LEVEL1', 'FEED_2011.LEVEL1'])
 
 
-def should_raise_exception_if_library_does_not_exist(toplevel_tickstore):
+def test_should_raise_exception_if_library_does_not_exist(toplevel_tickstore):
     with pytest.raises(LibraryNotFoundException) as e:
         toplevel_tickstore.add(DateRange(start=dt(2010, 1, 1), end=dt(2010, 12, 31, 23, 59, 59, 999000)), 'FEED_2010.LEVEL1')
         assert toplevel_tickstore._collection.find_one({'library_name': 'FEED_2010.LEVEL1'})
     assert "Library FEED_2010.LEVEL1 was not correctly initialized" in str(e)
 
 
-def should_raise_exception_if_date_range_for_library_overlaps_with_existing_libraries(toplevel_tickstore, arctic):
+def test_should_raise_exception_if_date_range_for_library_overlaps_with_existing_libraries(toplevel_tickstore, arctic):
     toplevel_tickstore._collection.insert_one({'library_name': 'FEED_2010.LEVEL1', 'start': dt(2010, 1, 1), 'end': dt(2010, 6, 30)})
     arctic.initialize_library('FEED_2010a.LEVEL1', tickstore.TICK_STORE_TYPE)
     with pytest.raises(OverlappingDataException) as e:
@@ -117,7 +120,8 @@ def should_raise_exception_if_date_range_for_library_overlaps_with_existing_libr
     assert "There are libraries that overlap with the date range:" in str(e)
 
 
-def should_successfully_do_a_roundtrip_write_and_read_spanning_multiple_underlying_libraries(toplevel_tickstore, arctic):
+@pytest.mark.xfail
+def test_should_successfully_do_a_roundtrip_write_and_read_spanning_multiple_underlying_libraries(toplevel_tickstore, arctic):
     arctic.initialize_library('FEED_2010.LEVEL1', tickstore.TICK_STORE_TYPE)
     arctic.initialize_library('FEED_2011.LEVEL1', tickstore.TICK_STORE_TYPE)
     arctic.initialize_library('test_current.toplevel_tickstore', tickstore.TICK_STORE_TYPE)
@@ -129,7 +133,7 @@ def should_successfully_do_a_roundtrip_write_and_read_spanning_multiple_underlyi
     toplevel_tickstore.write('blah', data)
     tickstore_current.write('blah', data)
     res = toplevel_tickstore.read('blah', DateRange(start=dt(2010, 12, 1), end=dt(2011, 2, 1)), columns=list('ABCD'))
-    assert_frame_equal(data, res.tz_localize(mktz('Europe/London')))
+    assert_frame_equal(data, res.tz_convert(mktz('Europe/London')))
     lib2010 = arctic['FEED_2010.LEVEL1']
     res = lib2010.read('blah', DateRange(start=dt(2010, 12, 1), end=dt(2011, 1, 1)), columns=list('ABCD'))
     assert_frame_equal(data[dt(2010, 12, 1): dt(2010, 12, 31)], res.tz_localize(mktz('Europe/London')))
@@ -143,7 +147,7 @@ def should_successfully_do_a_roundtrip_write_and_read_spanning_multiple_underlyi
                           (dt(2010, 1, 1), dt(2010, 12, 31), 0, 8),
                           (dt(2011, 1, 1), dt(2011, 12, 31), 7, 10),
                           ])
-def should_list_symbols_from_the_underlying_library(toplevel_tickstore, arctic, start, end, startr, endr):
+def test_should_list_symbols_from_the_underlying_library(toplevel_tickstore, arctic, start, end, startr, endr):
     arctic.initialize_library('FEED_2010.LEVEL1', tickstore.TICK_STORE_TYPE)
     arctic.initialize_library('FEED_2011.LEVEL1', tickstore.TICK_STORE_TYPE)
     toplevel_tickstore.add(DateRange(start=dt(2010, 1, 1), end=dt(2010, 12, 31, 23, 59, 59, 999000)), 'FEED_2010.LEVEL1')
@@ -158,7 +162,7 @@ def should_list_symbols_from_the_underlying_library(toplevel_tickstore, arctic,
     assert expected_symbols == toplevel_tickstore.list_symbols(DateRange(start=start, end=end))
 
 
-def should_add_underlying_libraries_when_intialized(arctic):
+def test_should_add_underlying_libraries_when_intialized(arctic):
     arctic.initialize_library('FEED_2010.LEVEL1', tickstore.TICK_STORE_TYPE)
     arctic.initialize_library('FEED_2011.LEVEL1', tickstore.TICK_STORE_TYPE)
     arctic.initialize_library('FEED.LEVEL1', toplevel.TICK_STORE_TYPE)