* Minor refactoring in ietf/tests.py

* Added correct dates for two entries in ipr_detail which had 0000-00-00,
   in the sql_fixup.sql file
 * Fixed test/run so it can be run from any directory
 - Legacy-Id: 258
This commit is contained in:
Henrik Levkowetz 2007-06-08 12:06:15 +00:00
parent 88666eac59
commit a99d598cc0
3 changed files with 26 additions and 23 deletions

View file

@ -93,35 +93,36 @@ class UrlTestCase(TestCase):
print "Not all the application URLs has test cases." print "Not all the application URLs has test cases."
def doUrlsTest(self, lst): def doUrlsTest(self, lst):
response_count = {"Exc": 0, "200": 0, } response_count = {}
for code, url in lst: for codes, url in lst:
if "skip" in code or "Skip" in code: if "skip" in codes or "Skip" in codes:
print "Skipping %s" % (url) print "Skipping %s" % (url)
elif url: elif url:
#print "Trying code, url: (<%s>, '%s')" % (code, url) #print "Trying codes, url: (%s, '%s')" % (codes, url)
try: try:
response = self.client.get(url) response = self.client.get(url)
res = str(response.status_code) code = str(response.status_code)
if not res in response_count: if code in codes:
response_count[res] = 0 print "OK %s %s" % (code, url)
response_count[res] += 1 res = ("OK", code)
if str(res) in code:
print "OK %s %s" % (res, url)
else: else:
print "Fail %s %s" % (res, url) print "Fail %s %s" % (code, url)
res = ("Fail", code)
except: except:
if not "Exc" in response_count: res = ("Fail", "Exc")
response_count["Exc"] = 0
response_count["Exc"] += 1
print "Exception for URL '%s'" % url print "Exception for URL '%s'" % url
traceback.print_exc() traceback.print_exc()
if not res in response_count:
response_count[res] = 0
response_count[res] += 1
else: else:
pass pass
for code in response_count: for res in response_count:
print " %s: %s " % (code, response_count[code]) ind, code = res
for code in response_count: print "%4s %s: %s " % (ind, code, response_count[res])
if str(code) != "200": for res in response_count:
self.assertEqual(response_count[code], 0) ind, code = res
self.assertEqual(ind, "OK", "Found %s cases of result code: %s" % (response_count[res], code))
def testUrlsList(self): def testUrlsList(self):
lst = [(tuple[0], tuple[1]) for tuple in self.testtuples] lst = [(tuple[0], tuple[1]) for tuple in self.testtuples]

View file

@ -7,11 +7,11 @@ progdir=${0%/*}
cd $progdir/.. # now at trunk/ cd $progdir/.. # now at trunk/
$progdir/test-setup # create a patched django for test purposes, and more test/test-setup # create a patched django for test purposes, and more
$progdir/run-pyflakes ietf test/run-pyflakes ietf
PYTHONPATH=$progdir/lib python ietf/manage.py test # run tests with our patched django PYTHONPATH=test/lib python ietf/manage.py test # run tests with our patched django
$progdir/test-teardown test/test-teardown

View file

@ -26,3 +26,5 @@ INSERT INTO announced_from VALUES (98, 'IETF Executive Director <exec-director@i
INSERT INTO announced_to VALUES (9, 'Unknown', NULL); INSERT INTO announced_to VALUES (9, 'Unknown', NULL);
INSERT INTO area_status VALUES (3, 'Unknown'); INSERT INTO area_status VALUES (3, 'Unknown');
UPDATE ipr_detail SET submitted_date=2000-09-15 WHERE ipr_id=170;
UPDATE ipr_detail SET submitted_date=2004-08-30 WHERE ipr_id=418;