viff

changeset 1542:8e06a2598579

Merged.
author Thomas P Jakobsen <tpj@cs.au.dk>
date Mon, 20 Sep 2010 21:56:39 +0200
parents d2f48fac982a 01dc3a6add2e
children 7db2fafaab44
files viff/test/test_bedoza_triple.py
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line diff
     1.1 --- a/viff/test/test_bedoza_runtime.py	Mon Sep 20 21:50:37 2010 +0200
     1.2 +++ b/viff/test/test_bedoza_runtime.py	Mon Sep 20 21:56:39 2010 +0200
     1.3 @@ -525,3 +525,8 @@
     1.4          d.addCallback(check)
     1.5          return d
     1.6      
     1.7 +def skip_tests(module_name):
     1.8 +    BeDOZaBasicCommandsTest.skip = "Skipped due to missing " + module_name + " module."
     1.9 +
    1.10 +if not pypaillier:
    1.11 +    skip_tests("pypaillier")
     2.1 --- a/viff/test/test_bedoza_triple.py	Mon Sep 20 21:50:37 2010 +0200
     2.2 +++ b/viff/test/test_bedoza_triple.py	Mon Sep 20 21:56:39 2010 +0200
     2.3 @@ -213,7 +213,7 @@
     2.4      gen = PartialShareGenerator(Zp, runtime, share_random, paillier)
     2.5      return gen.generate_random_shares(n)
     2.6  
     2.7 -class ParialShareGeneratorTest(BeDOZaTestCase):
     2.8 +class PartialShareGeneratorTest(BeDOZaTestCase):
     2.9      num_players = 3
    2.10   
    2.11      @protocol
    2.12 @@ -411,7 +411,7 @@
    2.13          random = Random(283883)        
    2.14          triple_generator = TripleGenerator(runtime, p, random)
    2.15  
    2.16 -        triples = triple_generator.generate_triples(100)
    2.17 +        triples = triple_generator.generate_triples(10)
    2.18  
    2.19          def check((a, b, c)):
    2.20              self.assertEquals(c, a * b)