From: Brian Warner <warner@allmydata.com>
Date: Sat, 7 Apr 2007 01:16:50 +0000 (-0700)
Subject: pyfec: trial-ize the unit tests, making sure to keep working if trial is unavailable
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=5233805637b82c10068b8f97334a87564bf75252;p=tahoe-lafs%2Ftahoe-lafs.git

pyfec: trial-ize the unit tests, making sure to keep working if trial is unavailable
---

diff --git a/pyfec/fec/test/__init__.py b/pyfec/fec/test/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/pyfec/fec/test/test_pyfec.py b/pyfec/fec/test/test_pyfec.py
index e4a1a247..d4f4fba9 100644
--- a/pyfec/fec/test/test_pyfec.py
+++ b/pyfec/fec/test/test_pyfec.py
@@ -91,12 +91,13 @@ def _test_random():
     ss = [ randstr(l/k) for x in range(k) ]
     _h(k, m, ss)
 
-def test_random():
+def test_random(noisy=True):
     for i in range(2**5):
         # sys.stdout.write(",")
         _test_random()
         # sys.stdout.write(".")
-    print "%d randomized tests pass." % (i+1)
+    if noisy:
+        print "%d randomized tests pass." % (i+1)
 
 def test_bad_args_enc():
     encer = fec.Encoder(2, 4)
@@ -137,7 +138,19 @@ def test_bad_args_dec():
         assert "Second argument was not a sequence" in str(e), e
     else:
         raise "Should have gotten TypeError for wrong type of second argument."
-    
+
+try:
+    from twisted.trial import unittest
+    class TestPyFec(unittest.TestCase):
+        def test_random(self):
+            test_random(False)
+        def test_bad_args_enc(self):
+            test_bad_args_enc()
+        def test_bad_args_dec(self):
+            test_bad_args_dec()
+except ImportError:
+    # trial is unavailable, oh well
+    pass
 
 if __name__ == "__main__":
     test_bad_args_dec()
diff --git a/pyfec/setup.py b/pyfec/setup.py
index 8fbb755b..24ba55c7 100644
--- a/pyfec/setup.py
+++ b/pyfec/setup.py
@@ -63,7 +63,7 @@ setup(name='pyfec',
       url='http://zooko.com/repos/pyfec',
       license='GNU GPL',
       platform='Any',
-      packages=['fec'],
+      packages=['fec', 'fec.test'],
       classifiers=trove_classifiers,
       ext_modules=[Extension('_fec', ['fec/fec.c', 'fec/_fecmodule.c',], extra_link_args=extra_link_args, extra_compile_args=extra_compile_args, undef_macros=undef_macros),],
       )