Skip to content

Commit 5dff7df

Browse files
committed
Merge pull request pandas-dev#9839 from dstephens99/TestGoogle
TST: Fix tests in TestGoogle
2 parents f396ba2 + 064feca commit 5dff7df

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pandas/io/tests/test_data.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def assert_n_failed_equals_n_null_columns(wngs, obj, cls=SymbolWarning):
3333
all_nan_cols = pd.Series(dict((k, pd.isnull(v).all()) for k, v in
3434
compat.iteritems(obj)))
3535
n_all_nan_cols = all_nan_cols.sum()
36-
valid_warnings = pd.Series([wng for wng in wngs if isinstance(wng, cls)])
36+
valid_warnings = pd.Series([wng for wng in wngs if wng.category == cls])
3737
assert_equal(len(valid_warnings), n_all_nan_cols)
3838
failed_symbols = all_nan_cols[all_nan_cols].index
3939
msgs = valid_warnings.map(lambda x: x.message)
@@ -79,18 +79,18 @@ def test_get_goog_volume(self):
7979
for locale in self.locales:
8080
with tm.set_locale(locale):
8181
df = web.get_data_google('GOOG').sort_index()
82-
self.assertEqual(df.Volume.ix['OCT-08-2010'], 2863473)
82+
self.assertEqual(df.Volume.ix['JAN-02-2015'], 1446662)
8383

8484
@network
8585
def test_get_multi1(self):
8686
for locale in self.locales:
8787
sl = ['AAPL', 'AMZN', 'GOOG']
8888
with tm.set_locale(locale):
8989
pan = web.get_data_google(sl, '2012')
90-
ts = pan.Close.GOOG.index[pan.Close.AAPL > pan.Close.GOOG]
90+
ts = pan.Close.GOOG.index[pan.Close.AAPL < pan.Close.GOOG]
9191
if (hasattr(pan, 'Close') and hasattr(pan.Close, 'GOOG') and
9292
hasattr(pan.Close, 'AAPL')):
93-
self.assertEqual(ts[0].dayofyear, 96)
93+
self.assertEqual(ts[0].dayofyear, 3)
9494
else:
9595
self.assertRaises(AttributeError, lambda: pan.Close)
9696

@@ -135,7 +135,7 @@ def test_dtypes(self):
135135
def test_unicode_date(self):
136136
#GH8967
137137
data = web.get_data_google('F', start='JAN-01-10', end='JAN-27-13')
138-
self.assertEquals(data.index.name, 'Date')
138+
self.assertEqual(data.index.name, 'Date')
139139

140140

141141
class TestYahoo(tm.TestCase):

0 commit comments

Comments
 (0)