[tor-commits] [bridgedb/master] Run unittests before changing to the runtime tests directory.

[isis@xxxxxxxxxxxxxx]

commit 41e3a3d748760e26d4bc437ca1ab3cfd80535d22
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Tue Oct 15 15:00:23 2013 +0000

    Run unittests before changing to the runtime tests directory.
    
    And Don't run trial-based tests until #9199's tests are merged.
    
    (cherry picked from commit 31cff62c026a94edd114a5adff2848899569c5f6)
    Created a new branch in order to drop commit
    826f872e075a639250d565a8d93b1c405256f82d.
    
    Signed-off-by: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
---
 .travis.yml |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 48c8384..276c5d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ notifications:
     on_failure: change
 before_install:
   - sudo apt-get update
-  - sudo apt-get install tor-geoipdb build-essential python-dev python-setuptools openssl sqlite3 libgpgme11-dev
+  - sudo apt-get install --no-install-suggests --no-install-recommends tor-geoipdb build-essential python-dev python-setuptools openssl sqlite3 libgpgme11-dev
 python:
   - "2.6"
   - "2.7"
@@ -21,6 +21,7 @@ install:
   - make install
 # command to run tests, e.g. python setup.py test
 script:
+  - python setup.py test
   - test -d run || mkdir run
   - openssl genrsa -des3 -passout pass:bridgedb -out privkey 4096
   - openssl req -batch -passin pass:bridgedb -new -key privkey -out server.csr
@@ -35,8 +36,8 @@ script:
   - cp ./bridgedb.conf ./run/
   - chmod +x .travis.test.sh
   - cd run
-  - gen_bridge_descriptors 2000
-  - ../.travis.test.sh 30 bridgedb -c bridgedb.conf
-  - python setup.py test
-  - bridgedb trial
-  - echo "Build successful."
+  - ../scripts/make-ssl-cert
+  - ../scripts/executioner 60 bridgedb -c bridgedb.conf
+# add this when #9199's (or some other trial-based) tests are merged:
+#  - bridgedb test -n 2000
+#  - echo "Build successful."



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits