Skip to content

Commit

Permalink
tests cleanup, enabled py34 in travis, added pretest before running t…
Browse files Browse the repository at this point in the history
…ests.
  • Loading branch information
ssbarnea committed Jul 18, 2014
1 parent a5506bd commit caf3660
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ tests/settings.py
encrypt-credentials.sh
setenv.sh
test-quick
settings.py
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ env:
matrix:
- TOX_ENV=py26
- TOX_ENV=py27
- TOX_ENV=py32
- TOX_ENV=py33
- TOX_ENV=py34
- TOX_ENV=docs
global:
- secure: EUpWmrnhHKPkz9cOGbEEwhBtUBRqtQ775ck042B8/pI9ZZZghbKl3Jm8ahpfms3JiZcHMCG06MBREs1ISK/g2OfHKsdULCg5g3UFXteVQo769kwh/x4lniSbU2eipcN0s9Q/Ak5zStwTa5aNQ4FU/3zSgTDxi/OcDKGXDbVwHD8=
Expand All @@ -16,7 +15,9 @@ env:
install:
- pip install -r requirements.txt
- pip install -r requirements-dev.txt
script: tox -e $TOX_ENV
script:
- ./pretest
- tox -e $TOX_ENV
branches:
only:
- master
Expand Down
9 changes: 9 additions & 0 deletions pretest
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

CODE=`curl -L -s -u $CI_JIRA_ADMIN:$CI_JIRA_ADMIN_PASSWORD -X GET -H "Content-Type: application/json" -o /dev/null -w "%{http_code}" https://pycontribs.atlassian.net/rest/api/2/issue/createmeta`
if [ "$CODE" == "200" ]; then
echo INFO: JIRA authentication works so we can continue...
else
echo FATAL: Unable to authenticate
exit 1
fi
2 changes: 0 additions & 2 deletions tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -972,9 +972,7 @@ class IssueLinkTests(unittest.TestCase):

def setUp(self):
self.manager = JiraTestManager()
print(self.manager)

@unittest.skip('needs rework')
def test_issue_link(self):
link = self.manager.jira_admin.issue_link('10220')
self.assertEqual(link.id, '10220')
Expand Down

0 comments on commit caf3660

Please sign in to comment.