Changeset 4336

Timestamp:

Mar 29, 2007, 11:35:19 AM (18 years ago)

Author:

ole

Message:

Fix a bug in test_caching.py so that it will work with test_all.py

File:

• anuga_core/source/anuga/caching/test_caching.py (modified) (2 diffs)

anuga_core/source/anuga/caching/test_caching.py

@@ -394 +394 @@
           self.value = value      
 
+      # Make sure that class has been redefined to another address
+      #print
+      #print 'Initial_addr  ', initial_addr
+      #print 'Redefined addr', `Dummy_memorytest`
+      msg = 'Redefined class ended up at same memory location as '
+      msg += 'original class making this test irrelevant. Try to run '
+      msg += 'it again and see if this error goes away.'
+      msg += 'If it persists contact Ole.Nielsen@ga.gov.au'
+      assert initial_addr != `Dummy_memorytest`, msg   
+
+      
       retrieve_cache(Dummy_memorytest, verbose=verbose)      
           
 
+# Define class Dummy_memorytest before any tests are run
+# to make sure it has a different memory address
+# to the one defined in test 'test_objects_are_created_memory'
+class Dummy_memorytest:
+  def __init__(self, value, another):
+    self.value = value      
+
+# Cache created for use with 'test_objects_are_created_memory'
+initial_addr = `Dummy_memorytest`
+clear_and_create_cache(Dummy_memorytest, verbose=False)
+  
+      
+
 
 
@@ -405 +429 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-
-    # Cache created for test_objects_are_created_memory to make sure it has a different memory address
-    clear_and_create_cache(Dummy_memorytest, verbose=False)
-  
     suite = unittest.makeSuite(Test_Caching,'test')
     runner = unittest.TextTestRunner()