tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Run Selenium tests against port 8080 to avoid conflicts.

Browse Source
This commit is contained in:
Ramon Novoa 2016-09-19 14:13:02 +02:00
parent 89e3149479
commit 0f13fb9c43
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -22,6 +22,6 @@ before_script:
- sleep 3 # give xvfb some time to start - sleep 3 # give xvfb some time to start
script: script:
- docker run --name pandorafms -h pandorafms -dt -v "$TRAVIS_BUILD_DIR:/tmp/pandorafms" -p 127.0.0.1:80:80 pandorafms/pandorafms-base tail -f /var/log/messages - docker run --name pandorafms -h pandorafms -dt -v "$TRAVIS_BUILD_DIR:/tmp/pandorafms" -p 127.0.0.1:8080:80 pandorafms/pandorafms-base tail -f /var/log/messages
- docker exec -t pandorafms /tmp/pandorafms/tests/test.sh - docker exec -t pandorafms /tmp/pandorafms/tests/test.sh
- python $TRAVIS_BUILD_DIR/tests/run_console_tests.py - python $TRAVIS_BUILD_DIR/tests/run_console_tests.py

2
tests/console/include/common_classes_60.py
View File

@ -52,7 +52,7 @@ class PandoraWebDriverTestCase(TestCase):
cls.display = Display(visible=0, size=(800, 600)) cls.display = Display(visible=0, size=(800, 600))
cls.display.start() cls.display.start()
cls.driver = webdriver.Firefox() cls.driver = webdriver.Firefox()
cls.base_url = "http://127.0.0.1/" cls.base_url = "http://127.0.0.1:8080/"
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):