Skip to content

Commit

Permalink
Remove TeamCity CI depedency
Browse files Browse the repository at this point in the history
  • Loading branch information
pitbulk committed Jul 26, 2018
1 parent dde22dd commit b463dd4
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 67 deletions.
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -38,7 +38,6 @@
],
extras_require={
'test': (
'teamcity-messages==1.17',
'coverage>=3.6',
'freezegun==0.3.5',
'pylint==1.3.1',
Expand Down
7 changes: 1 addition & 6 deletions tests/src/OneLogin/saml2_tests/auth_test.py
Expand Up @@ -7,8 +7,6 @@
import json
from os.path import dirname, join, exists
import unittest
from teamcity import is_running_under_teamcity
from teamcity.unittestpy import TeamcityTestRunner
from urlparse import urlparse, parse_qs

from onelogin.saml2.auth import OneLogin_Saml2_Auth
Expand Down Expand Up @@ -1166,8 +1164,5 @@ def testGetIdFromLogoutResponse(self):
self.assertIn(auth.get_last_message_id(), '_f9ee61bd9dbf63606faa9ae3b10548d5b3656fb859')

if __name__ == '__main__':
if is_running_under_teamcity():
runner = TeamcityTestRunner()
else:
runner = unittest.TextTestRunner()
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)
7 changes: 1 addition & 6 deletions tests/src/OneLogin/saml2_tests/authn_request_test.py
Expand Up @@ -7,8 +7,6 @@
import json
from os.path import dirname, join, exists
import unittest
from teamcity import is_running_under_teamcity
from teamcity.unittestpy import TeamcityTestRunner
from urlparse import urlparse, parse_qs
from zlib import decompress

Expand Down Expand Up @@ -341,8 +339,5 @@ def testAttributeConsumingService(self):
self.assertRegexpMatches(inflated, 'AttributeConsumingServiceIndex="1"')

if __name__ == '__main__':
if is_running_under_teamcity():
runner = TeamcityTestRunner()
else:
runner = unittest.TextTestRunner()
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)
7 changes: 1 addition & 6 deletions tests/src/OneLogin/saml2_tests/error_test.py
Expand Up @@ -4,8 +4,6 @@
# MIT License

import unittest
from teamcity import is_running_under_teamcity
from teamcity.unittestpy import TeamcityTestRunner
from onelogin.saml2.errors import OneLogin_Saml2_Error


Expand All @@ -19,8 +17,5 @@ def runTest(self):


if __name__ == '__main__':
if is_running_under_teamcity():
runner = TeamcityTestRunner()
else:
runner = unittest.TextTestRunner()
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)
7 changes: 1 addition & 6 deletions tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py
Expand Up @@ -10,8 +10,6 @@
from lxml.etree import XMLSyntaxError
import unittest
from urllib2 import URLError
from teamcity import is_running_under_teamcity
from teamcity.unittestpy import TeamcityTestRunner

from onelogin.saml2.idp_metadata_parser import OneLogin_Saml2_IdPMetadataParser
from onelogin.saml2.constants import OneLogin_Saml2_Constants
Expand Down Expand Up @@ -645,8 +643,5 @@ def test_merge_settings(self):
self.assertEqual(expected_settings3, settings_result3)

if __name__ == '__main__':
if is_running_under_teamcity():
runner = TeamcityTestRunner()
else:
runner = unittest.TextTestRunner()
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)
7 changes: 1 addition & 6 deletions tests/src/OneLogin/saml2_tests/logout_request_test.py
Expand Up @@ -7,8 +7,6 @@
import json
from os.path import dirname, join, exists
import unittest
from teamcity import is_running_under_teamcity
from teamcity.unittestpy import TeamcityTestRunner
from urlparse import urlparse, parse_qs
from xml.dom.minidom import parseString

Expand Down Expand Up @@ -545,8 +543,5 @@ def testGetXML(self):


if __name__ == '__main__':
if is_running_under_teamcity():
runner = TeamcityTestRunner()
else:
runner = unittest.TextTestRunner()
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)
7 changes: 1 addition & 6 deletions tests/src/OneLogin/saml2_tests/logout_response_test.py
Expand Up @@ -6,8 +6,6 @@
import json
from os.path import dirname, join, exists
import unittest
from teamcity import is_running_under_teamcity
from teamcity.unittestpy import TeamcityTestRunner
from urlparse import urlparse, parse_qs
from xml.dom.minidom import parseString

Expand Down Expand Up @@ -412,8 +410,5 @@ def testGetXML(self):


if __name__ == '__main__':
if is_running_under_teamcity():
runner = TeamcityTestRunner()
else:
runner = unittest.TextTestRunner()
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)
7 changes: 1 addition & 6 deletions tests/src/OneLogin/saml2_tests/metadata_test.py
Expand Up @@ -9,8 +9,6 @@
from time import strftime
from datetime import datetime
import unittest
from teamcity import is_running_under_teamcity
from teamcity.unittestpy import TeamcityTestRunner

from onelogin.saml2.metadata import OneLogin_Saml2_Metadata
from onelogin.saml2.settings import OneLogin_Saml2_Settings
Expand Down Expand Up @@ -290,8 +288,5 @@ def testAddX509KeyDescriptors(self):


if __name__ == '__main__':
if is_running_under_teamcity():
runner = TeamcityTestRunner()
else:
runner = unittest.TextTestRunner()
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)
7 changes: 1 addition & 6 deletions tests/src/OneLogin/saml2_tests/response_test.py
Expand Up @@ -10,8 +10,6 @@
import json
from os.path import dirname, join, exists
import unittest
from teamcity import is_running_under_teamcity
from teamcity.unittestpy import TeamcityTestRunner
from xml.dom.minidom import parseString
from lxml import etree
from onelogin.saml2.response import OneLogin_Saml2_Response
Expand Down Expand Up @@ -1679,8 +1677,5 @@ def testGetAssertionNotOnOrAfter(self):


if __name__ == '__main__':
if is_running_under_teamcity():
runner = TeamcityTestRunner()
else:
runner = unittest.TextTestRunner()
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)
7 changes: 1 addition & 6 deletions tests/src/OneLogin/saml2_tests/settings_test.py
Expand Up @@ -6,8 +6,6 @@
import json
from os.path import dirname, join, exists, sep
import unittest
from teamcity import is_running_under_teamcity
from teamcity.unittestpy import TeamcityTestRunner

from onelogin.saml2.errors import OneLogin_Saml2_Error
from onelogin.saml2.settings import OneLogin_Saml2_Settings
Expand Down Expand Up @@ -750,8 +748,5 @@ def testIsDebugActive(self):


if __name__ == '__main__':
if is_running_under_teamcity():
runner = TeamcityTestRunner()
else:
runner = unittest.TextTestRunner()
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)
7 changes: 1 addition & 6 deletions tests/src/OneLogin/saml2_tests/signed_response_test.py
Expand Up @@ -7,8 +7,6 @@
import json
from os.path import dirname, join, exists
import unittest
from teamcity import is_running_under_teamcity
from teamcity.unittestpy import TeamcityTestRunner

from onelogin.saml2.response import OneLogin_Saml2_Response
from onelogin.saml2.settings import OneLogin_Saml2_Settings
Expand Down Expand Up @@ -62,8 +60,5 @@ def testResponseAndAssertionSigned(self):


if __name__ == '__main__':
if is_running_under_teamcity():
runner = TeamcityTestRunner()
else:
runner = unittest.TextTestRunner()
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)
7 changes: 1 addition & 6 deletions tests/src/OneLogin/saml2_tests/utils_test.py
Expand Up @@ -9,8 +9,6 @@
from lxml import etree
from os.path import dirname, join, exists
import unittest
from teamcity import is_running_under_teamcity
from teamcity.unittestpy import TeamcityTestRunner
from xml.dom.minidom import Document, parseString

from onelogin.saml2.constants import OneLogin_Saml2_Constants
Expand Down Expand Up @@ -1029,8 +1027,5 @@ def testValidateSign(self):


if __name__ == '__main__':
if is_running_under_teamcity():
runner = TeamcityTestRunner()
else:
runner = unittest.TextTestRunner()
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)

0 comments on commit b463dd4

Please sign in to comment.