Skip to content

Commit 233e7d3

Browse files
authored
Merge pull request #2 from reciprocity/ds/INFRA-1072
chore(INFRA-1072): migrate tests to the new package namespace (python3_saml)
2 parents 50f1755 + bde2544 commit 233e7d3

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ COVERAGE_CONFIG=tests/coverage.rc
77
COVERALLS=coveralls
88
MAIN_SOURCE=src/python3_saml/saml2
99
DEMOS=demo-django demo-flask demo-tornado demo_pyramid
10-
TESTS=tests/src/Python3Saml/saml2_tests
10+
TESTS=tests/src/Python3_Saml/saml2_tests
1111
SOURCES=$(MAIN_SOURCE) $(DEMOS) $(TESTS)
1212

1313
install-req:

tests/src/Python3_Saml/saml2_tests/settings_test.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,18 +174,18 @@ def testGetLibPath(self):
174174
settingsInfo = self.loadSettingsJSON()
175175
settings = OneLogin_Saml2_Settings(settingsInfo)
176176
path = settings.get_base_path()
177-
self.assertEqual(settings.get_lib_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/onelogin/saml2/"))
178-
self.assertEqual(path, join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/onelogin/saml2/../../../tests/data/customPath/"))
177+
self.assertEqual(settings.get_lib_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/python3_saml/saml2/"))
178+
self.assertEqual(path, join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/python3_saml/saml2/../../../tests/data/customPath/"))
179179

180180
del settingsInfo["custom_base_path"]
181181
settings = OneLogin_Saml2_Settings(settingsInfo)
182182
path = settings.get_base_path()
183-
self.assertEqual(settings.get_lib_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/onelogin/saml2/"))
183+
self.assertEqual(settings.get_lib_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/python3_saml/saml2/"))
184184
self.assertEqual(path, join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/"))
185185

186186
settings = OneLogin_Saml2_Settings(custom_base_path=self.settings_path)
187187
path = settings.get_base_path()
188-
self.assertEqual(settings.get_lib_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/onelogin/saml2/"))
188+
self.assertEqual(settings.get_lib_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/python3_saml/saml2/"))
189189
self.assertEqual(path, join(dirname(dirname(dirname(dirname(__file__)))), "settings/"))
190190

191191
def testGetSchemasPath(self):
@@ -195,18 +195,18 @@ def testGetSchemasPath(self):
195195
settingsInfo = self.loadSettingsJSON()
196196
settings = OneLogin_Saml2_Settings(settingsInfo)
197197
path = settings.get_base_path()
198-
self.assertEqual(settings.get_schemas_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/onelogin/saml2/schemas/"))
199-
self.assertEqual(path, join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/onelogin/saml2/../../../tests/data/customPath/"))
198+
self.assertEqual(settings.get_schemas_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/python3_saml/saml2/schemas/"))
199+
self.assertEqual(path, join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/python3_saml/saml2/../../../tests/data/customPath/"))
200200

201201
del settingsInfo["custom_base_path"]
202202
settings = OneLogin_Saml2_Settings(settingsInfo)
203203
path = settings.get_base_path()
204-
self.assertEqual(settings.get_schemas_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/onelogin/saml2/schemas/"))
204+
self.assertEqual(settings.get_schemas_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/python3_saml/saml2/schemas/"))
205205
self.assertEqual(path, join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/"))
206206

207207
settings = OneLogin_Saml2_Settings(custom_base_path=self.settings_path)
208208
path = settings.get_base_path()
209-
self.assertEqual(settings.get_schemas_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/onelogin/saml2/schemas/"))
209+
self.assertEqual(settings.get_schemas_path(), join(dirname(dirname(dirname(dirname(dirname(__file__))))), "src/python3_saml/saml2/schemas/"))
210210
self.assertEqual(path, join(dirname(dirname(dirname(dirname(__file__)))), "settings/"))
211211

212212
def testGetIdPSSOurl(self):

0 commit comments

Comments
 (0)