Changeset 1543

Show
Ignore:
Timestamp:
06/13/08 14:08:44 (3 months ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • cherokee/trunk/ChangeLog

    r1542 r1543  
     12008-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 
    1112008-06-12  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
    212 
  • cherokee/trunk/qa/167-RuleGeoIP.py

    r1507 r1543  
    3434        self.expected_content  = MAGIC 
    3535        self.forbidden_content = ["/bin/sh", "echo"] 
    36         self.conf              = CONF % (DIR, DIR) 
    3736 
    3837    def Precondition (self): 
     
    4443 
    4544    def Prepare (self, www): 
     45        self.conf = CONF % (DIR, DIR) 
     46 
    4647        d = self.Mkdir (www, DIR) 
    4748        f = self.WriteFile (d, FILE, 0755, CGI) 
  • cherokee/trunk/qa/run-tests.py

    r1453 r1543  
    204204# Prepare www files 
    205205for obj in objs: 
    206     obj.Prepare(www) 
     206    if obj.Precondition(): 
     207        obj.Prepare(www) 
    207208 
    208209# Generate configuration