[tor-commits] [bridgedb/master] Use $CWD as the RUN_IN_DIR if unspecified, and update .travis.yml.

[isis@xxxxxxxxxxxxxx]

commit a0cf2bdcf38c4b2a6fd8033fee4fcbf788497460
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Sat Oct 26 11:53:16 2013 +0000

    Use $CWD as the RUN_IN_DIR if unspecified, and update .travis.yml.
---
 .travis.yml         |    7 ++-----
 lib/bridgedb/opt.py |    4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e757005..3da05f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,14 +35,11 @@ install:
 # command to run tests, e.g. python setup.py test
 script:
   - python setup.py test
-  - test -d run || mkdir run
-  - cp bridgedb.conf run/
   - chmod u+x scripts/make-ssl-cert
   - chmod u+x scripts/executioner
-  - cd run
-  - ../scripts/make-ssl-cert
-  - ../scripts/executioner 60 bridgedb -r . -c bridgedb.conf
   - bridgedb mock
+  - ./scripts/make-ssl-cert
+  - ./scripts/executioner 180 bridgedb -c bridgedb.conf
   # add this when #9199's (or some other trial-based) tests are merged:
   #- bridgedb test
   - echo "Build successful."
diff --git a/lib/bridgedb/opt.py b/lib/bridgedb/opt.py
index d3532b6..e7ec7c3 100644
--- a/lib/bridgedb/opt.py
+++ b/lib/bridgedb/opt.py
@@ -56,7 +56,7 @@ class BaseOptions(usage.Options):
     def opt_rundir(self, rundir):
         """Change to this directory"""
         if not rundir:
-            rundir = os.path.join(os.getcwdu(), 'run')
+            rundir = os.getcwdu()
         else:
             try:
                 rundir = os.path.abspath(os.path.expanduser(rundir))
@@ -71,7 +71,7 @@ class BaseOptions(usage.Options):
         this base options parser are inherited by all child classes.
         """
         usage.Options.__init__(self)
-        self['rundir'] = os.path.join(os.getcwdu(), 'run')
+        self['rundir'] = os.getcwdu()
         self['version'] = self.opt_version
         self['verbosity'] = 30
 



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