Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1781 from bdarnell/options-path 

options_test: Absolutize `__file__`
This commit is contained in:
Ben Darnell 2016-07-26 10:05:10 -04:00 committed by GitHub
parent 613299c6d4 d588bfb77d
commit 098be29cb4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -30,9 +30,13 @@ install:
- curl-config --version; pip freeze - curl-config --version; pip freeze
script: script:
# Get out of the source directory before running tests to avoid PYTHONPATH # Run the tests once from the source directory to detect issues
# confusion. This is necessary to ensure that the speedups module can # involving relative __file__ paths; see
# be found in the installation directory. # https://github.com/tornadoweb/tornado/issues/1780
- unset TORNADO_EXTENSION && python -m tornado.test
# For all other test variants, get out of the source directory before
# running tests to ensure that we get the installed speedups module
# instead of the source directory which doesn't have it.
- cd maint - cd maint
# Copy the coveragerc down so coverage.py can find it. # Copy the coveragerc down so coverage.py can find it.
- cp ../.coveragerc . - cp ../.coveragerc .

2
tornado/test/options_test.py
View File

@ -36,7 +36,7 @@ class OptionsTest(unittest.TestCase):
options.define("port", default=80) options.define("port", default=80)
options.define("username", default='foo') options.define("username", default='foo')
options.define("my_path") options.define("my_path")
config_path = os.path.join(os.path.dirname(__file__), config_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
"options_test.cfg") "options_test.cfg")
options.parse_config_file(config_path) options.parse_config_file(config_path)
self.assertEqual(options.port, 443) self.assertEqual(options.port, 443)