r4511 - branches/scale_testing/mech_scripts

Author: tmckay
Date: 2011-02-09 14:41:07 +0000 (Wed, 09 Feb 2011)
New Revision: 4511

Modified:
   branches/scale_testing/mech_scripts/test_driver.py
Log:
Skip directory files in links, retry connect up to 10 times on timeout


Modified: branches/scale_testing/mech_scripts/test_driver.py
===================================================================
--- branches/scale_testing/mech_scripts/test_driver.py	2011-02-09 14:02:40 UTC (rev 4510)
+++ branches/scale_testing/mech_scripts/test_driver.py	2011-02-09 14:41:07 UTC (rev 4511)
@@ -28,6 +28,7 @@
         self.machine = None
         self.link_file = None
         self.visited = {}
+        self.file_list = []
 
         self.file_init = False
         self.file_number = 0
@@ -38,9 +39,11 @@
         if not self.file_init:
             self.file_init = True
             if os.path.isdir(self.link_file):
-                self.file_list = os.listdir(self.link_file)
-                for i in range(len(self.file_list)):
-                    self.file_list[i] = os.path.join(self.link_file, self.file_list[i])
+                file_list = os.listdir(self.link_file)
+                for i in file_list:
+                    p = os.path.join(self.link_file, i)
+                    if not os.path.isdir(p):
+                        self.file_list.append(p)                    
             else:
                 self.file_list = [self.link_file]
 
@@ -149,9 +152,21 @@
                 if link in self.visited and self.visited[link] and if_modified_header:
                     # value for link will be the time it was visited.
                     headers={"If-Modified-Since": self.visited[link]}
-                    conn.request('GET', link, headers=headers)
                 else:
-                    conn.request('GET', link)
+                    headers={}
+
+                stat = False
+                for i in range(10):
+                    try:
+                        conn.request('GET', link, headers=headers)
+                        stat = True
+                        break
+                    except:
+                        pass
+
+                if not stat:
+                    continue
+
                 resp = conn.getresponse()
                 data = resp.read()
                 get_latency += time_time() - time_for_get