Skip to content

Commit 43f9999

Browse files
committed
test: use dotenv to load config
1 parent 234d19b commit 43f9999

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

test/integration/test_global_catalog_v1.py

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,19 @@
2323
from ibm_platform_services.global_catalog_v1 import *
2424
from ibm_cloud_sdk_core.authenticators import IAMAuthenticator
2525
import pytest
26-
from jproperties import Properties
26+
from dotenv import load_dotenv
2727
import time
2828

2929
configFile = 'global_catalog.env'
3030
configLoaded = None
3131
config = {}
3232

3333
if os.path.exists(configFile):
34-
with open(configFile, "rb") as f:
35-
p = Properties()
36-
p.load(f, "utf-8")
37-
config['GLOBAL_CATALOG_APIKEY'] = p['GLOBAL_CATALOG_APIKEY'].data
38-
config['GLOBAL_CATALOG_AUTH_URL'] = p['GLOBAL_CATALOG_AUTH_URL'].data
39-
config['GLOBAL_CATALOG_URL'] = p['GLOBAL_CATALOG_URL'].data
40-
34+
load_dotenv(dotenv_path=configFile)
4135
configLoaded = True
4236
else:
4337
print('External configuration was not found, skipping tests...')
38+
configLoaded = True
4439

4540
class TestGlobalCatalogV1(unittest.TestCase):
4641

@@ -49,16 +44,9 @@ def setUpClass(self):
4944
if not configLoaded:
5045
raise unittest.SkipTest('External configuration not available, skipping...')
5146

52-
apiKey = config['GLOBAL_CATALOG_APIKEY']
53-
iamUrl = config['GLOBAL_CATALOG_AUTH_URL']
54-
assert apiKey is not None
55-
assert iamUrl is not None
56-
57-
authenticator = IAMAuthenticator(apiKey, url=iamUrl)
5847
timestamp = int(time.time())
5948

60-
self.service = GlobalCatalogV1(authenticator=authenticator)
61-
self.service.set_service_url(config['GLOBAL_CATALOG_URL'])
49+
self.service = GlobalCatalogV1.new_instance()
6250

6351
self.defaultEntry = {
6452
'name': 'someName{}'.format(timestamp),

0 commit comments

Comments
 (0)