@@ -6,7 +6,8 @@ def data_gen(path): return path[1:] + "\n" def fun_map(e, params): - return [(md5.new(str(math.pow(int(e), 2))).digest(), "")] + k = str(int(math.ceil(float(e))) ** 2) + return [(md5.new(k).hexdigest(), "")] tserver.run_server(data_gen) disco = Disco(sys.argv[1]) @@ -19,11 +20,17 @@ job = disco.new_job(name = "test_reqmodules", required_modules = ["math", "md5"], sort = False) -for i, r in zip(inputs, result_iterator(job.wait())): - c = md5.new(str(math.pow(int(i), 2))).digest() - if c != r[0]: - raise Exception("Invalid answer: Correct: %s Got: %s"\ - % (c, r[0])) +res = list(result_iterator(job.wait())) +if len(res) != len(inputs): + raise Exception("Too few results: Got: %d Should be %d" % + (len(res), len(inputs))) + +cor = map(lambda x: md5.new(str(int(math.ceil(x)) ** 2)).hexdigest(), inputs) + +for k, v in res: + if k not in cor: + raise Exception("Invalid answer: %s" % k) + cor.remove(k) job.clean() print "ok" test/test_reqmodules.py 51d27f5dd3599f3401adaca6ba6baa6bd7381bf5 Ville Tuulos tuulos@nxfront.nokiapaloalto.com http://github.com/tuulos/disco/commit/0c7cacf2af61a5dc23d4e642928bd168795f50a5 0c7cacf2af61a5dc23d4e642928bd168795f50a5 2008-10-24T16:29:00-07:00 2008-10-24T16:27:38-07:00 bugfix: test_reqmodules checked results incorrectly d1f37b576eb5d6b476e8c608d223c6702a15c7be Ville Tuulos tuulos@nxfront.nokiapaloalto.com