Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-27 10:16:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed code to pass unittests. Change script's is_valid method to correctly catch if it is checked on an object which is already deleted, as per #509.

Browse source
This commit is contained in:
Griatch 2014-06-15 13:19:38 +02:00
parent 3a6a8d5c48
commit 53b204bb76
8 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tests/test_scripts_models.py
View file

@ -18,7 +18,10 @@ class TestScriptDB(TestCase):
self.scr = create_script(DoNothing)
def tearDown(self):
self.scr.delete()
try:
self.scr.delete()
except ObjectDoesNotExist:
pass
del self.scr
def test_delete(self):
@ -28,15 +31,16 @@ class TestScriptDB(TestCase):
def test_double_delete(self):
"What should happen? Isn't it already deleted?"
self.scr.delete()
self.scr.delete()
with self.assertRaises(ObjectDoesNotExist):
self.scr.delete()
self.scr.delete()
@unittest.skip("not implemented")
def test___init__fails(self): # Users should be told not to do this
with self.assertRaises(Exception):
ScriptDB()
#@unittest.skip("not implemented")
#def test___init__fails(self): # Users should be told not to do this
# - No they should not; ScriptDB() is required internally. /Griatch
# with self.assertRaises(Exception):
# ScriptDB()
@unittest.skip("not implemented")
def test_deleted_script_fails_start(self):
"Would it ever be necessary to start a deleted script?"
self.scr.delete()
@ -44,14 +48,11 @@ class TestScriptDB(TestCase):
self.scr.start()
# Check the script is not recreated as a side-effect
self.assertFalse(self.scr in ScriptDB.objects.get_all_scripts())
self.scr = create_script(DoNothing) # for tearDown()
@unittest.skip("not implemented")
def test_deleted_script_is_invalid(self):
"Can deleted scripts be said to be valid?"
self.scr.delete()
self.assertFalse(self.scr.is_valid()) # assertRaises? See issue #509
self.scr = create_script(DoNothing) # for tearDown()
if __name__ == '__main__':