Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix all unit tests

Browse source
This commit is contained in:
Griatch 2020-04-19 12:55:21 +02:00
parent 5571ef8a7d
commit fce0f404aa
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
evennia/contrib/test_traits.py
View file

@ -519,7 +519,7 @@ class TestTraitGauge(_TraitHandlerBase):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.traithandler.add( self.traithandler.add(
"test2", "test1",
name="Test1", name="Test1",
trait_type='gauge', trait_type='gauge',
base=8, # max = base + mod base=8, # max = base + mod
@ -527,7 +527,7 @@ class TestTraitGauge(_TraitHandlerBase):
extra_val1="xvalue1", extra_val1="xvalue1",
extra_val2="xvalue2" extra_val2="xvalue2"
) )
self.trait1 = self.traithandler.get("test2") self.trait1 = self.traithandler.get("test1")
def _get_values(self): def _get_values(self):
return (self.trait1.base, self.trait1.mod, self.trait1.actual, return (self.trait1.base, self.trait1.mod, self.trait1.actual,
@ -537,9 +537,10 @@ class TestTraitGauge(_TraitHandlerBase):
self.assertEqual( self.assertEqual(
self._get_dbstore("test1"), self._get_dbstore("test1"),
{"name": "Test1", {"name": "Test1",
"trait_type": 'counter', "trait_type": 'gauge',
"base": 8, "base": 8,
"mod": 2, "mod": 2,
"min": 0,
"extra_val1": "xvalue1", "extra_val1": "xvalue1",
"extra_val2": "xvalue2" "extra_val2": "xvalue2"
} }
@ -559,8 +560,8 @@ class TestTraitGauge(_TraitHandlerBase):
self.trait1.base -= 4 self.trait1.base -= 4
self.assertEqual(self._get_values(), (8, 2, 5, 0, 10)) self.assertEqual(self._get_values(), (8, 2, 5, 0, 10))
self.trait1.min = -100 self.trait1.min = -100
self.trait.base = -20 self.trait1.base = -20
self.assertEqual(self._get_values(), (-20, 2, -18, -100, 10)) self.assertEqual(self._get_values(), (-20, 2, -18, -100, -18))
def test_boundaries__minmax(self): def test_boundaries__minmax(self):
"""Test range""" """Test range"""

2
evennia/contrib/traits.py
View file

@ -686,7 +686,7 @@ class Trait:
try: try:
# check if we have a custom deleter # check if we have a custom deleter
_DA(self, key) _DA(self, key)
except AttributeHandler: except AttributeError:
# delete normally # delete normally
del self._data[key] del self._data[key]
else: else: