Changeset 3481 for tools/demos/test_flood_database.py

Timestamp:

Aug 10, 2006, 1:54:02 PM (18 years ago)

Author:

ole

Message:

Update of flood database testing

File:

• tools/demos/test_flood_database.py (modified) (3 diffs)

tools/demos/test_flood_database.py

@@ -45 +45 @@
     fid = open(filename)
 
-    for link in get_individual_studies(fid.readlines()):
+    total_detail = 0
+    for i, link in enumerate(get_individual_studies(fid.readlines())):
         url = base_url+htmlmap(link)
       
         live = False  
-        print 'Testing %s...' %link[:72],
+        print 'Testing link %d: %s...' %(i, link[:72]),
         T = get_page(url)
 
@@ -60 +61 @@
 
         if live is True:    
-            print 'OK: Link is live'
+            print 'OK: Link %d is live' %i
         else:
-            msg = 'FAIL: Link is not live: %s' %url
+            msg = 'FAIL: Link %d is not live: %s' %(i,url)
             raise msg
 
 
-        # Secon tier links  
-        for link in get_second_tier_links(T):
+        # Secon tier links
+        
+        for j, link in enumerate(get_second_tier_links(T)):
             url = servlet_base_url+htmlmap(link)
       
             live = False  
-            print 'Testing %s...' %link[:80],
+            print 'Testing detail %d: %s...' %(j, link[:80]),
             T = get_page(url)
 
@@ -82 +84 @@
 
             if live is True:    
-                print 'OK: Detail link is live'
+                print 'OK: Detail link %d is live (total=%d)' %(j, total_detail)
             else:
                 for line in T:
                     print line.strip()                
-                msg = 'FAIL: Detail link is not live'
-                print msg
+                msg = 'FAIL: Detail link %d is not live (total=%d)' %(j, total_detail)
+                raise msg
             
+            total_detail += 1