[tor-commits] [bridgedb/master] Fix missing import; use less CI resources.

[isis at torproject.org]

commit 0acc8139a797d0152fd3fc4a53b0e05ff14b2f11
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat Oct 26 12:06:01 2013 +0000

    Fix missing import; use less CI resources.
---
 .travis.yml                    |    4 ++--
 scripts/gen_bridge_descriptors |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3da05f5..6dcbfd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,11 +34,11 @@ install:
 
 # command to run tests, e.g. python setup.py test
 script:
-  - python setup.py test
   - chmod u+x scripts/make-ssl-cert
   - chmod u+x scripts/executioner
-  - bridgedb mock
   - ./scripts/make-ssl-cert
+  - bridgedb mock -n 250
+  - bridgedb test
   - ./scripts/executioner 180 bridgedb -c bridgedb.conf
   # add this when #9199's (or some other trial-based) tests are merged:
   #- bridgedb test
diff --git a/scripts/gen_bridge_descriptors b/scripts/gen_bridge_descriptors
index 5bbc702..ddfd86e 100644
--- a/scripts/gen_bridge_descriptors
+++ b/scripts/gen_bridge_descriptors
@@ -22,6 +22,7 @@ import binascii
 import hashlib
 import ipaddr
 import math
+import os
 import sys
 import random
 import re
@@ -349,7 +350,7 @@ def createRSAKey(bits=1024):
 def createNTORKey():
     """Create a Curve25519 key."""
     if nacl is None:
-        raise NotImplemented
+        raise NotImplementedError
 
 def createKey(selfsign=True, digest='sha1'):
     """Create a set of public and private RSA keypairs and corresponding certs.