test: debug test failures

Author: dubee

.travis.yml

@@ -17,8 +17,8 @@ before_install:
 - sudo apt-get install pandoc
 - pip install pypandoc
 - '[ "${TRAVIS_PULL_REQUEST}" == "false" ] && openssl aes-256-cbc -K $encrypted_3058bc69cb40_key -iv $encrypted_3058bc69cb40_iv -in ghost.env.enc -out ghost.env -d || true'
-- '[ "${TRAVIS_PULL_REQUEST}" == "false" ] && openssl aes-256-cbc -K $encrypted_66f264007c0d_key -iv $encrypted_66f264007c0d_iv -in iam_access_groups.env.enc -out iam_access_groups.env -d -d || true'
-- '[ "${TRAVIS_PULL_REQUEST}" == "false" ] && openssl aes-256-cbc -K $encrypted_c15ed1ae2677_key -iv $encrypted_c15ed1ae2677_iv -in global_catalog.env.enc -out global_catalog.env -d || true'
+- '[ "${TRAVIS_PULL_REQUEST}" == "false" ] && openssl aes-256-cbc -K $encrypted_94fa7fdf4df9_key -iv $encrypted_94fa7fdf4df9_iv -in global_catalog.env.enc -out global_catalog.env -d || true'
+- '[ "${TRAVIS_PULL_REQUEST}" == "false" ] && openssl aes-256-cbc -K $encrypted_66f264007c0d_key -iv $encrypted_66f264007c0d_iv -in iam_access_groups.env.enc -out iam_access_groups.env -d || true'
 
 install:
 - pip install tox-travis

global_catalog.env.enc

@@ -1,2 +1 @@
-�]a	f���QQu�I��
-�|�{�R5���$Y34[�j�z��z�c�H�R��o)'}m9��'����N"Ѷ\�����%Std�#��o\`��s-"�\��}۾:��"wa�GH�Rc��4{�p��	���r���1{�)y���fjj����Oj�_tq4��C���vZ�-I7��tR�e��b���~H
�ۢ��YNxw��p4�'����i����zTj�ׄ�_c>N��n
+�5Ł��x�8��'[�#��K��&��G�'�WƧy���l��}Gٺ�/u�!�̄P�3���Ӣ{�z���{W̎Md�yGt���{�N��=����i���!��������K�L7��)�,�/����k�1
7���V @gsG1���ĞʆV�S!S��;�-�#C�x�$�cy��$����!(�!���P?t�2���}���-�ۋ���}zO6p��, z�a���J|H�����

test/integration/test_global_catalog_v1.py

@@ -19,46 +19,50 @@
 
 import unittest
 import os
-from ibm_platform_services import GlobalCatalogV1
 from ibm_cloud_sdk_core import *
+from ibm_platform_services.global_catalog_v1 import *
+from ibm_cloud_sdk_core.authenticators import IAMAuthenticator
 import pytest
+from jproperties import Properties
+import time
 
 configFile = 'global_catalog.env'
 configLoaded = None
+config = {}
 
 if os.path.exists(configFile):
-    os.environ['IBM_CREDENTIALS_FILE'] = configFile
+    with open(configFile, "rb") as f:
+        p = Properties()
+        p.load(f, "utf-8")
+        config['GLOBAL_CATALOG_APIKEY'] = p['GLOBAL_CATALOG_APIKEY'].data
+        config['GLOBAL_CATALOG_AUTH_URL'] = p['GLOBAL_CATALOG_AUTH_URL'].data
+        config['GLOBAL_CATALOG_URL'] = p['GLOBAL_CATALOG_URL'].data
+
     configLoaded = True
 else:
     print('External configuration was not found, skipping tests...')
 
 class TestGlobalCatalogV1(unittest.TestCase):
 
     @classmethod
-    def setUpClass(cls):
+    def setUpClass(self):
         if not configLoaded:
             raise unittest.SkipTest('External configuration not available, skipping...')
 
-        cls.service = GlobalCatalogV1.new_instance()
-        assert cls.service is not None
-
-        cls.config = read_external_sources(GlobalCatalogV1.DEFAULT_SERVICE_NAME)
-        assert cls.config is not None
-        cls.authType = cls.config.get('AUTH_TYPE')
-        cls.apkKey = cls.config.get('APIKEY')
-        cls.authUrl = cls.config.get('AUTH_URL')
-        cls.url = cls.config.get('URL')
-        assert cls.authType is not None
-        print(cls.authType)
-        assert cls.apkKey is not None
-        assert cls.authUrl is not None
-        print(cls.authUrl)
-        assert cls.url is not None
-        print(cls.url)
-
-        cls.defaultEntry = {
-            'name': 'someName',
-            'id': 'someId',
+        apiKey = config['GLOBAL_CATALOG_APIKEY']
+        iamUrl = config['GLOBAL_CATALOG_AUTH_URL']
+        assert apiKey is not None
+        assert iamUrl is not None
+        authenticator = IAMAuthenticator(apiKey, url=iamUrl)
+
+        self.service = GlobalCatalogV1(authenticator=authenticator)
+        self.service.set_service_url(config['GLOBAL_CATALOG_URL'])
+
+        timestamp = int(time.time())
+
+        self.defaultEntry = {
+            'name': 'someName{}'.format(timestamp),
+            'id': 'someId{}'.format(timestamp),
             'active': False,
             'kind': 'service',
             'disabled': False,
@@ -92,10 +96,10 @@ def setUpClass(cls):
             }
         }
 
-        cls.defaultChildEntry = {
+        self.defaultChildEntry = {
             'name': 'someChildName',
             'id': 'someChildId',
-            'parent_id': cls.defaultEntry['id'],
+            'parent_id': self.defaultEntry['id'],
             'active': False,
             'kind': 'service',
             'disabled': False,
@@ -119,9 +123,9 @@ def setUpClass(cls):
             }
         }
 
-        cls.updatedEntry = {
-            'name': 'someNameUpdated',
-            'id': 'someId',
+        self.updatedEntry = {
+            'name': 'someNameUpdated{}'.format(timestamp),
+            'id': 'someId{}'.format(timestamp),
             'active': False,
             'kind': 'template',
             'disabled': False,
@@ -145,12 +149,11 @@ def setUpClass(cls):
             }
         }
 
-    def setup(self):
+    def setUp(self):
         self.service.delete_catalog_entry(id=self.defaultEntry['id'])
 
-    @classmethod
-    def tearDown(cls):
-        cls.service.delete_catalog_entry(id=cls.defaultEntry['id'])
+    def tearDown(self):
+        self.service.delete_catalog_entry(id=self.defaultEntry['id'])
 
     def test_create_catalog_entry(self):
         env = self.service.create_catalog_entry(id=self.defaultEntry['id'],