Skip to content

Commit 8d80a42

Browse files
committed
TST: make removal tests exact for test_pytables
1 parent ef5aeae commit 8d80a42

File tree

1 file changed

+21
-10
lines changed

1 file changed

+21
-10
lines changed

pandas/io/tests/test_pytables.py

+21-10
Original file line numberDiff line numberDiff line change
@@ -2272,7 +2272,7 @@ def test_remove_where(self):
22722272

22732273
# try to remove non-table (with crit)
22742274
# non-table ok (where = None)
2275-
wp = tm.makePanel()
2275+
wp = tm.makePanel(30)
22762276
store.put('wp', wp, format='table')
22772277
store.remove('wp', ["minor_axis=['A', 'D']"])
22782278
rs = store.select('wp')
@@ -2303,59 +2303,66 @@ def test_remove_startstop(self):
23032303

23042304
with ensure_clean_store(self.path) as store:
23052305

2306-
wp = tm.makePanel()
2306+
wp = tm.makePanel(30)
23072307

23082308
# start
2309+
_maybe_remove(store, 'wp1')
23092310
store.put('wp1', wp, format='t')
23102311
n = store.remove('wp1', start=32)
2311-
#assert(n == 120-32)
2312+
self.assertTrue(n == 120-32)
23122313
result = store.select('wp1')
23132314
expected = wp.reindex(major_axis=wp.major_axis[:32//4])
23142315
assert_panel_equal(result, expected)
23152316

2317+
_maybe_remove(store, 'wp2')
23162318
store.put('wp2', wp, format='t')
23172319
n = store.remove('wp2', start=-32)
2318-
#assert(n == 32)
2320+
self.assertTrue(n == 32)
23192321
result = store.select('wp2')
23202322
expected = wp.reindex(major_axis=wp.major_axis[:-32//4])
23212323
assert_panel_equal(result, expected)
23222324

23232325
# stop
2326+
_maybe_remove(store, 'wp3')
23242327
store.put('wp3', wp, format='t')
23252328
n = store.remove('wp3', stop=32)
2326-
#assert(n == 32)
2329+
self.assertTrue(n == 32)
23272330
result = store.select('wp3')
23282331
expected = wp.reindex(major_axis=wp.major_axis[32//4:])
23292332
assert_panel_equal(result, expected)
23302333

2334+
_maybe_remove(store, 'wp4')
23312335
store.put('wp4', wp, format='t')
23322336
n = store.remove('wp4', stop=-32)
2333-
#assert(n == 120-32)
2337+
self.assertTrue(n == 120-32)
23342338
result = store.select('wp4')
23352339
expected = wp.reindex(major_axis=wp.major_axis[-32//4:])
23362340
assert_panel_equal(result, expected)
23372341

23382342
# start n stop
2343+
_maybe_remove(store, 'wp5')
23392344
store.put('wp5', wp, format='t')
23402345
n = store.remove('wp5', start=16, stop=-16)
2341-
#assert(n == 120-32)
2346+
self.assertTrue(n == 120-32)
23422347
result = store.select('wp5')
23432348
expected = wp.reindex(major_axis=wp.major_axis[:16//4]+wp.major_axis[-16//4:])
23442349
assert_panel_equal(result, expected)
23452350

2351+
_maybe_remove(store, 'wp6')
23462352
store.put('wp6', wp, format='t')
23472353
n = store.remove('wp6', start=16, stop=16)
2348-
#assert(n == 0)
2354+
self.assertTrue(n == 0)
23492355
result = store.select('wp6')
23502356
expected = wp.reindex(major_axis=wp.major_axis)
23512357
assert_panel_equal(result, expected)
23522358

23532359
# with where
2360+
_maybe_remove(store, 'wp7')
23542361
date = wp.major_axis.take(np.arange(0,30,3))
23552362
crit = Term('major_axis=date')
23562363
store.put('wp7', wp, format='t')
23572364
n = store.remove('wp7', where=[crit], stop=80)
2358-
#assert(n == 28)
2365+
self.assertTrue(n == 28)
23592366
result = store.select('wp7')
23602367
expected = wp.reindex(major_axis=wp.major_axis-wp.major_axis[np.arange(0,20,3)])
23612368
assert_panel_equal(result, expected)
@@ -2364,9 +2371,10 @@ def test_remove_crit(self):
23642371

23652372
with ensure_clean_store(self.path) as store:
23662373

2367-
wp = tm.makePanel()
2374+
wp = tm.makePanel(30)
23682375

23692376
# group row removal
2377+
_maybe_remove(store, 'wp3')
23702378
date4 = wp.major_axis.take([0, 1, 2, 4, 5, 6, 8, 9, 10])
23712379
crit4 = Term('major_axis=date4')
23722380
store.put('wp3', wp, format='t')
@@ -2377,6 +2385,7 @@ def test_remove_crit(self):
23772385
assert_panel_equal(result, expected)
23782386

23792387
# upper half
2388+
_maybe_remove(store, 'wp')
23802389
store.put('wp', wp, format='table')
23812390
date = wp.major_axis[len(wp.major_axis) // 2]
23822391

@@ -2394,6 +2403,7 @@ def test_remove_crit(self):
23942403
assert_panel_equal(result, expected)
23952404

23962405
# individual row elements
2406+
_maybe_remove(store, 'wp2')
23972407
store.put('wp2', wp, format='table')
23982408

23992409
date1 = wp.major_axis[1:3]
@@ -2420,6 +2430,7 @@ def test_remove_crit(self):
24202430
assert_panel_equal(result, expected)
24212431

24222432
# corners
2433+
_maybe_remove(store, 'wp4')
24232434
store.put('wp4', wp, format='table')
24242435
n = store.remove(
24252436
'wp4', where=[Term('major_axis>wp.major_axis[-1]')])

0 commit comments

Comments
 (0)