Add pre-test cleanup to corpse equipment tests

polserver · Mar 24, 2024 · c9e0e5c · c9e0e5c
1 parent 3a1d6de
commit c9e0e5c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/testsuite/pol/testpkgs/client/test_client_corpse.src b/testsuite/pol/testpkgs/client/test_client_corpse.src
@@ -43,6 +43,11 @@ endfunction
 exported function test_corpse_equipment()
   var res, corpse_equipment, corpse_content, goldcoin;
 
+  // Clean up old, leftover corpses from other tests
+  foreach corpse in ListItemsNearLocationOfType( 100, 100, 0, 15, 0x2006 )
+    DestroyItem( corpse );
+  endforeach
+
   if ( !( res := MoveObjectToLocation( char, 100, 100, 0, flags := MOVEOBJECT_FORCELOCATION ) ) )
     return cleanup_ret_error( $"Could not move player: {res}" );
   endif

diff --git a/testsuite/testclient/pyuo/pyuo/client.py b/testsuite/testclient/pyuo/pyuo/client.py
@@ -194,7 +194,7 @@ def __getitem__(self, key):
     return self.content[key]
 
 class Corpse(Container):
-  equip = {}
+  equip = None
 
   def __init__(self, client):
     super().__init__(client)
@@ -826,6 +826,7 @@ def handlePacket(self, pkt):
       if pkt.serial in self.objects:
         corpse = self.objects[pkt.serial]
         if isinstance(corpse, Corpse):
+          corpse.equip = {}
           for item in pkt.equip:
             corpse.equip[item['layer']] = item['serial']
 

diff --git a/testsuite/testclient/pyuo/testclient.py b/testsuite/testclient/pyuo/testclient.py
@@ -282,7 +282,7 @@ def sendEvent(self, ev):
           res["objs"][-1]["parent"]=o.parent.serial
     elif ev.type==Event.EVT_LIST_EQUIPPED_ITEMS:
       res["objs"]=[]
-      if ev.owner is not None and ev.owner.equip is not None:
+      if ev.owner is not None and hasattr(ev.owner, 'equip') and ev.owner.equip is not None:
         for k,o in ev.owner.equip.items():
           res["objs"].append(
                 {'serial':o, 'layer':k} if isinstance(o, int) else