Skip to content

Commit 596aad4

Browse files
committed
remove nose from test_attrs
1 parent 85d644a commit 596aad4

File tree

1 file changed

+86
-86
lines changed

1 file changed

+86
-86
lines changed

zarr/tests/test_attrs.py

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import unittest
55

66

7-
from nose.tools import eq_ as eq, assert_raises
7+
import pytest
88

99

1010
from zarr.attrs import Attributes
@@ -24,14 +24,14 @@ def test_storage(self):
2424
a = Attributes(store=store, key='attrs')
2525
assert 'foo' not in a
2626
assert 'bar' not in a
27-
eq(dict(), a.asdict())
27+
assert dict() == a.asdict()
2828

2929
a['foo'] = 'bar'
3030
a['baz'] = 42
3131
assert 'attrs' in store
3232
assert isinstance(store['attrs'], binary_type)
3333
d = json.loads(text_type(store['attrs'], 'ascii'))
34-
eq(dict(foo='bar', baz=42), d)
34+
assert dict(foo='bar', baz=42) == d
3535

3636
def test_get_set_del_contains(self):
3737

@@ -41,11 +41,11 @@ def test_get_set_del_contains(self):
4141
a['baz'] = 42
4242
assert 'foo' in a
4343
assert 'baz' in a
44-
eq('bar', a['foo'])
45-
eq(42, a['baz'])
44+
assert 'bar' == a['foo']
45+
assert 42 == a['baz']
4646
del a['foo']
4747
assert 'foo' not in a
48-
with assert_raises(KeyError):
48+
with pytest.raises(KeyError):
4949
# noinspection PyStatementEffect
5050
a['foo']
5151

@@ -57,44 +57,44 @@ def test_update_put(self):
5757
assert 'baz' not in a
5858

5959
a.update(foo='spam', bar=42, baz=4.2)
60-
eq(a['foo'], 'spam')
61-
eq(a['bar'], 42)
62-
eq(a['baz'], 4.2)
60+
assert a['foo'] == 'spam'
61+
assert a['bar'] == 42
62+
assert a['baz'] == 4.2
6363

6464
a.put(dict(foo='eggs', bar=84))
65-
eq(a['foo'], 'eggs')
66-
eq(a['bar'], 84)
65+
assert a['foo'] == 'eggs'
66+
assert a['bar'] == 84
6767
assert 'baz' not in a
6868

6969
def test_iterators(self):
7070

7171
a = self.init_attributes(dict())
72-
eq(0, len(a))
73-
eq(set(), set(a))
74-
eq(set(), set(a.keys()))
75-
eq(set(), set(a.values()))
76-
eq(set(), set(a.items()))
72+
assert 0 == len(a)
73+
assert set() == set(a)
74+
assert set() == set(a.keys())
75+
assert set() == set(a.values())
76+
assert set() == set(a.items())
7777

7878
a['foo'] = 'bar'
7979
a['baz'] = 42
8080

81-
eq(2, len(a))
82-
eq({'foo', 'baz'}, set(a))
83-
eq({'foo', 'baz'}, set(a.keys()))
84-
eq({'bar', 42}, set(a.values()))
85-
eq({('foo', 'bar'), ('baz', 42)}, set(a.items()))
81+
assert 2 == len(a)
82+
assert {'foo', 'baz'} == set(a)
83+
assert {'foo', 'baz'} == set(a.keys())
84+
assert {'bar', 42} == set(a.values())
85+
assert {('foo', 'bar'), ('baz', 42)} == set(a.items())
8686

8787
def test_read_only(self):
8888
store = dict()
8989
a = self.init_attributes(store, read_only=True)
9090
store['attrs'] = json.dumps(dict(foo='bar', baz=42)).encode('ascii')
91-
eq(a['foo'], 'bar')
92-
eq(a['baz'], 42)
93-
with assert_raises(PermissionError):
91+
assert a['foo'] == 'bar'
92+
assert a['baz'] == 42
93+
with pytest.raises(PermissionError):
9494
a['foo'] = 'quux'
95-
with assert_raises(PermissionError):
95+
with pytest.raises(PermissionError):
9696
del a['foo']
97-
with assert_raises(PermissionError):
97+
with pytest.raises(PermissionError):
9898
a.update(foo='quux')
9999

100100
def test_key_completions(self):
@@ -118,108 +118,108 @@ def test_caching_on(self):
118118

119119
# setup store
120120
store = CountingDict()
121-
eq(0, store.counter['__getitem__', 'attrs'])
122-
eq(0, store.counter['__setitem__', 'attrs'])
121+
assert 0 == store.counter['__getitem__', 'attrs']
122+
assert 0 == store.counter['__setitem__', 'attrs']
123123
store['attrs'] = json.dumps(dict(foo='xxx', bar=42)).encode('ascii')
124-
eq(0, store.counter['__getitem__', 'attrs'])
125-
eq(1, store.counter['__setitem__', 'attrs'])
124+
assert 0 == store.counter['__getitem__', 'attrs']
125+
assert 1 == store.counter['__setitem__', 'attrs']
126126

127127
# setup attributes
128128
a = self.init_attributes(store)
129129

130130
# test __getitem__ causes all attributes to be cached
131-
eq(a['foo'], 'xxx')
132-
eq(1, store.counter['__getitem__', 'attrs'])
133-
eq(a['bar'], 42)
134-
eq(1, store.counter['__getitem__', 'attrs'])
135-
eq(a['foo'], 'xxx')
136-
eq(1, store.counter['__getitem__', 'attrs'])
131+
assert a['foo'] == 'xxx'
132+
assert 1 == store.counter['__getitem__', 'attrs']
133+
assert a['bar'] == 42
134+
assert 1 == store.counter['__getitem__', 'attrs']
135+
assert a['foo'] == 'xxx'
136+
assert 1 == store.counter['__getitem__', 'attrs']
137137

138138
# test __setitem__ updates the cache
139139
a['foo'] = 'yyy'
140-
eq(2, store.counter['__getitem__', 'attrs'])
141-
eq(2, store.counter['__setitem__', 'attrs'])
142-
eq(a['foo'], 'yyy')
143-
eq(2, store.counter['__getitem__', 'attrs'])
144-
eq(2, store.counter['__setitem__', 'attrs'])
140+
assert 2 == store.counter['__getitem__', 'attrs']
141+
assert 2 == store.counter['__setitem__', 'attrs']
142+
assert a['foo'] == 'yyy'
143+
assert 2 == store.counter['__getitem__', 'attrs']
144+
assert 2 == store.counter['__setitem__', 'attrs']
145145

146146
# test update() updates the cache
147147
a.update(foo='zzz', bar=84)
148-
eq(3, store.counter['__getitem__', 'attrs'])
149-
eq(3, store.counter['__setitem__', 'attrs'])
150-
eq(a['foo'], 'zzz')
151-
eq(a['bar'], 84)
152-
eq(3, store.counter['__getitem__', 'attrs'])
153-
eq(3, store.counter['__setitem__', 'attrs'])
148+
assert 3 == store.counter['__getitem__', 'attrs']
149+
assert 3 == store.counter['__setitem__', 'attrs']
150+
assert a['foo'] == 'zzz'
151+
assert a['bar'] == 84
152+
assert 3 == store.counter['__getitem__', 'attrs']
153+
assert 3 == store.counter['__setitem__', 'attrs']
154154

155155
# test __contains__ uses the cache
156156
assert 'foo' in a
157-
eq(3, store.counter['__getitem__', 'attrs'])
158-
eq(3, store.counter['__setitem__', 'attrs'])
157+
assert 3 == store.counter['__getitem__', 'attrs']
158+
assert 3 == store.counter['__setitem__', 'attrs']
159159
assert 'spam' not in a
160-
eq(3, store.counter['__getitem__', 'attrs'])
161-
eq(3, store.counter['__setitem__', 'attrs'])
160+
assert 3 == store.counter['__getitem__', 'attrs']
161+
assert 3 == store.counter['__setitem__', 'attrs']
162162

163163
# test __delitem__ updates the cache
164164
del a['bar']
165-
eq(4, store.counter['__getitem__', 'attrs'])
166-
eq(4, store.counter['__setitem__', 'attrs'])
165+
assert 4 == store.counter['__getitem__', 'attrs']
166+
assert 4 == store.counter['__setitem__', 'attrs']
167167
assert 'bar' not in a
168-
eq(4, store.counter['__getitem__', 'attrs'])
169-
eq(4, store.counter['__setitem__', 'attrs'])
168+
assert 4 == store.counter['__getitem__', 'attrs']
169+
assert 4 == store.counter['__setitem__', 'attrs']
170170

171171
# test refresh()
172172
store['attrs'] = json.dumps(dict(foo='xxx', bar=42)).encode('ascii')
173-
eq(4, store.counter['__getitem__', 'attrs'])
173+
assert 4 == store.counter['__getitem__', 'attrs']
174174
a.refresh()
175-
eq(5, store.counter['__getitem__', 'attrs'])
176-
eq(a['foo'], 'xxx')
177-
eq(5, store.counter['__getitem__', 'attrs'])
178-
eq(a['bar'], 42)
179-
eq(5, store.counter['__getitem__', 'attrs'])
175+
assert 5 == store.counter['__getitem__', 'attrs']
176+
assert a['foo'] == 'xxx'
177+
assert 5 == store.counter['__getitem__', 'attrs']
178+
assert a['bar'] == 42
179+
assert 5 == store.counter['__getitem__', 'attrs']
180180

181181
def test_caching_off(self):
182182

183183
# setup store
184184
store = CountingDict()
185-
eq(0, store.counter['__getitem__', 'attrs'])
186-
eq(0, store.counter['__setitem__', 'attrs'])
185+
assert 0 == store.counter['__getitem__', 'attrs']
186+
assert 0 == store.counter['__setitem__', 'attrs']
187187
store['attrs'] = json.dumps(dict(foo='xxx', bar=42)).encode('ascii')
188-
eq(0, store.counter['__getitem__', 'attrs'])
189-
eq(1, store.counter['__setitem__', 'attrs'])
188+
assert 0 == store.counter['__getitem__', 'attrs']
189+
assert 1 == store.counter['__setitem__', 'attrs']
190190

191191
# setup attributes
192192
a = self.init_attributes(store, cache=False)
193193

194194
# test __getitem__
195-
eq(a['foo'], 'xxx')
196-
eq(1, store.counter['__getitem__', 'attrs'])
197-
eq(a['bar'], 42)
198-
eq(2, store.counter['__getitem__', 'attrs'])
199-
eq(a['foo'], 'xxx')
200-
eq(3, store.counter['__getitem__', 'attrs'])
195+
assert a['foo'] == 'xxx'
196+
assert 1 == store.counter['__getitem__', 'attrs']
197+
assert a['bar'] == 42
198+
assert 2 == store.counter['__getitem__', 'attrs']
199+
assert a['foo'] == 'xxx'
200+
assert 3 == store.counter['__getitem__', 'attrs']
201201

202202
# test __setitem__
203203
a['foo'] = 'yyy'
204-
eq(4, store.counter['__getitem__', 'attrs'])
205-
eq(2, store.counter['__setitem__', 'attrs'])
206-
eq(a['foo'], 'yyy')
207-
eq(5, store.counter['__getitem__', 'attrs'])
208-
eq(2, store.counter['__setitem__', 'attrs'])
204+
assert 4 == store.counter['__getitem__', 'attrs']
205+
assert 2 == store.counter['__setitem__', 'attrs']
206+
assert a['foo'] == 'yyy'
207+
assert 5 == store.counter['__getitem__', 'attrs']
208+
assert 2 == store.counter['__setitem__', 'attrs']
209209

210210
# test update()
211211
a.update(foo='zzz', bar=84)
212-
eq(6, store.counter['__getitem__', 'attrs'])
213-
eq(3, store.counter['__setitem__', 'attrs'])
214-
eq(a['foo'], 'zzz')
215-
eq(a['bar'], 84)
216-
eq(8, store.counter['__getitem__', 'attrs'])
217-
eq(3, store.counter['__setitem__', 'attrs'])
212+
assert 6 == store.counter['__getitem__', 'attrs']
213+
assert 3 == store.counter['__setitem__', 'attrs']
214+
assert a['foo'] == 'zzz'
215+
assert a['bar'] == 84
216+
assert 8 == store.counter['__getitem__', 'attrs']
217+
assert 3 == store.counter['__setitem__', 'attrs']
218218

219219
# test __contains__
220220
assert 'foo' in a
221-
eq(9, store.counter['__getitem__', 'attrs'])
222-
eq(3, store.counter['__setitem__', 'attrs'])
221+
assert 9 == store.counter['__getitem__', 'attrs']
222+
assert 3 == store.counter['__setitem__', 'attrs']
223223
assert 'spam' not in a
224-
eq(10, store.counter['__getitem__', 'attrs'])
225-
eq(3, store.counter['__setitem__', 'attrs'])
224+
assert 10 == store.counter['__getitem__', 'attrs']
225+
assert 3 == store.counter['__setitem__', 'attrs']

0 commit comments

Comments
 (0)