Changeset 1543
- Timestamp:
- 06/13/08 14:08:44 (3 months ago)
- Files:
-
- cherokee/trunk/ChangeLog (modified) (1 diff)
- cherokee/trunk/qa/167-RuleGeoIP.py (modified) (2 diffs)
- cherokee/trunk/qa/run-tests.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
cherokee/trunk/ChangeLog
r1542 r1543 1 2008-06-13 Alvaro Lopez Ortega <alvaro@alobbs.com> 2 3 * qa/167-RuleGeoIP.py (Test.Prepare): Configuration is not added 4 to the test server it the test won't be executed. 5 6 * qa/run-tests.py: Do not "prepare" the QA test if it will be 7 skipped. It speeds up starting and more importantly fixes a 8 problem with the QA test 167 when the GeoIP module was not 9 present. 10 1 11 2008-06-12 Alvaro Lopez Ortega <alvaro@alobbs.com> 2 12 cherokee/trunk/qa/167-RuleGeoIP.py
r1507 r1543 34 34 self.expected_content = MAGIC 35 35 self.forbidden_content = ["/bin/sh", "echo"] 36 self.conf = CONF % (DIR, DIR)37 36 38 37 def Precondition (self): … … 44 43 45 44 def Prepare (self, www): 45 self.conf = CONF % (DIR, DIR) 46 46 47 d = self.Mkdir (www, DIR) 47 48 f = self.WriteFile (d, FILE, 0755, CGI) cherokee/trunk/qa/run-tests.py
r1453 r1543 204 204 # Prepare www files 205 205 for obj in objs: 206 obj.Prepare(www) 206 if obj.Precondition(): 207 obj.Prepare(www) 207 208 208 209 # Generate configuration