Skip to content

Commit b463dd4

Browse files
committed
Remove TeamCity CI depedency
1 parent dde22dd commit b463dd4

File tree

12 files changed

+11
-67
lines changed

12 files changed

+11
-67
lines changed

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
],
3939
extras_require={
4040
'test': (
41-
'teamcity-messages==1.17',
4241
'coverage>=3.6',
4342
'freezegun==0.3.5',
4443
'pylint==1.3.1',

tests/src/OneLogin/saml2_tests/auth_test.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import json
88
from os.path import dirname, join, exists
99
import unittest
10-
from teamcity import is_running_under_teamcity
11-
from teamcity.unittestpy import TeamcityTestRunner
1210
from urlparse import urlparse, parse_qs
1311

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

11681166
if __name__ == '__main__':
1169-
if is_running_under_teamcity():
1170-
runner = TeamcityTestRunner()
1171-
else:
1172-
runner = unittest.TextTestRunner()
1167+
runner = unittest.TextTestRunner()
11731168
unittest.main(testRunner=runner)

tests/src/OneLogin/saml2_tests/authn_request_test.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import json
88
from os.path import dirname, join, exists
99
import unittest
10-
from teamcity import is_running_under_teamcity
11-
from teamcity.unittestpy import TeamcityTestRunner
1210
from urlparse import urlparse, parse_qs
1311
from zlib import decompress
1412

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

343341
if __name__ == '__main__':
344-
if is_running_under_teamcity():
345-
runner = TeamcityTestRunner()
346-
else:
347-
runner = unittest.TextTestRunner()
342+
runner = unittest.TextTestRunner()
348343
unittest.main(testRunner=runner)

tests/src/OneLogin/saml2_tests/error_test.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
# MIT License
55

66
import unittest
7-
from teamcity import is_running_under_teamcity
8-
from teamcity.unittestpy import TeamcityTestRunner
97
from onelogin.saml2.errors import OneLogin_Saml2_Error
108

119

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

2018

2119
if __name__ == '__main__':
22-
if is_running_under_teamcity():
23-
runner = TeamcityTestRunner()
24-
else:
25-
runner = unittest.TextTestRunner()
20+
runner = unittest.TextTestRunner()
2621
unittest.main(testRunner=runner)

tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
from lxml.etree import XMLSyntaxError
1111
import unittest
1212
from urllib2 import URLError
13-
from teamcity import is_running_under_teamcity
14-
from teamcity.unittestpy import TeamcityTestRunner
1513

1614
from onelogin.saml2.idp_metadata_parser import OneLogin_Saml2_IdPMetadataParser
1715
from onelogin.saml2.constants import OneLogin_Saml2_Constants
@@ -645,8 +643,5 @@ def test_merge_settings(self):
645643
self.assertEqual(expected_settings3, settings_result3)
646644

647645
if __name__ == '__main__':
648-
if is_running_under_teamcity():
649-
runner = TeamcityTestRunner()
650-
else:
651-
runner = unittest.TextTestRunner()
646+
runner = unittest.TextTestRunner()
652647
unittest.main(testRunner=runner)

tests/src/OneLogin/saml2_tests/logout_request_test.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import json
88
from os.path import dirname, join, exists
99
import unittest
10-
from teamcity import is_running_under_teamcity
11-
from teamcity.unittestpy import TeamcityTestRunner
1210
from urlparse import urlparse, parse_qs
1311
from xml.dom.minidom import parseString
1412

@@ -545,8 +543,5 @@ def testGetXML(self):
545543

546544

547545
if __name__ == '__main__':
548-
if is_running_under_teamcity():
549-
runner = TeamcityTestRunner()
550-
else:
551-
runner = unittest.TextTestRunner()
546+
runner = unittest.TextTestRunner()
552547
unittest.main(testRunner=runner)

tests/src/OneLogin/saml2_tests/logout_response_test.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import json
77
from os.path import dirname, join, exists
88
import unittest
9-
from teamcity import is_running_under_teamcity
10-
from teamcity.unittestpy import TeamcityTestRunner
119
from urlparse import urlparse, parse_qs
1210
from xml.dom.minidom import parseString
1311

@@ -412,8 +410,5 @@ def testGetXML(self):
412410

413411

414412
if __name__ == '__main__':
415-
if is_running_under_teamcity():
416-
runner = TeamcityTestRunner()
417-
else:
418-
runner = unittest.TextTestRunner()
413+
runner = unittest.TextTestRunner()
419414
unittest.main(testRunner=runner)

tests/src/OneLogin/saml2_tests/metadata_test.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
from time import strftime
1010
from datetime import datetime
1111
import unittest
12-
from teamcity import is_running_under_teamcity
13-
from teamcity.unittestpy import TeamcityTestRunner
1412

1513
from onelogin.saml2.metadata import OneLogin_Saml2_Metadata
1614
from onelogin.saml2.settings import OneLogin_Saml2_Settings
@@ -290,8 +288,5 @@ def testAddX509KeyDescriptors(self):
290288

291289

292290
if __name__ == '__main__':
293-
if is_running_under_teamcity():
294-
runner = TeamcityTestRunner()
295-
else:
296-
runner = unittest.TextTestRunner()
291+
runner = unittest.TextTestRunner()
297292
unittest.main(testRunner=runner)

tests/src/OneLogin/saml2_tests/response_test.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import json
1111
from os.path import dirname, join, exists
1212
import unittest
13-
from teamcity import is_running_under_teamcity
14-
from teamcity.unittestpy import TeamcityTestRunner
1513
from xml.dom.minidom import parseString
1614
from lxml import etree
1715
from onelogin.saml2.response import OneLogin_Saml2_Response
@@ -1679,8 +1677,5 @@ def testGetAssertionNotOnOrAfter(self):
16791677

16801678

16811679
if __name__ == '__main__':
1682-
if is_running_under_teamcity():
1683-
runner = TeamcityTestRunner()
1684-
else:
1685-
runner = unittest.TextTestRunner()
1680+
runner = unittest.TextTestRunner()
16861681
unittest.main(testRunner=runner)

tests/src/OneLogin/saml2_tests/settings_test.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import json
77
from os.path import dirname, join, exists, sep
88
import unittest
9-
from teamcity import is_running_under_teamcity
10-
from teamcity.unittestpy import TeamcityTestRunner
119

1210
from onelogin.saml2.errors import OneLogin_Saml2_Error
1311
from onelogin.saml2.settings import OneLogin_Saml2_Settings
@@ -750,8 +748,5 @@ def testIsDebugActive(self):
750748

751749

752750
if __name__ == '__main__':
753-
if is_running_under_teamcity():
754-
runner = TeamcityTestRunner()
755-
else:
756-
runner = unittest.TextTestRunner()
751+
runner = unittest.TextTestRunner()
757752
unittest.main(testRunner=runner)

0 commit comments

Comments
 (0)