Merge pull request #1677 from hashtopolis/fix-tests

Fixed error in tests by removing deprecated {extension} from new conf…

Author: jessevz

ci/apiv2/hashtopolis.py

@@ -52,9 +52,9 @@ def __init__(self, *args, **kwargs):
 class HashtopolisConfig(object):
     def __init__(self):
         # Request access TOKEN, used throughout the test
-        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults.{extension}')),) \
+        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults{suffix}')),) \
                      + confidence.DEFAULT_LOAD_ORDER
-        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order)
+        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order, format=confidence.YAML())
         self._hashtopolis_uri = self._cfg['hashtopolis_uri']
         self._api_endpoint = self._hashtopolis_uri + '/api/v2'
         self.username = self._cfg['username']

ci/apiv2/hashtopolis_agent.py

@@ -46,9 +46,9 @@ class ProcessState(enum.IntEnum):
 class HashtopolisConfig(object):
     def __init__(self):
         # Request access TOKEN, used throughout the test
-        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults.{extension}')),) \
+        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults{suffix}')),) \
                      + confidence.DEFAULT_LOAD_ORDER
-        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order)
+        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order, format=confidence.YAML())
         self._hashtopolis_uri = self._cfg['hashtopolis_uri']
         self._api_endpoint = self._hashtopolis_uri + '/api/v2'
         self.username = self._cfg['username']
@@ -60,9 +60,9 @@ class DummyAgent(object):
     # State: Early Alpha
     def __init__(self, token=None, voucher=None):
         # Request access TOKEN, used throughout the test
-        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults.{extension}')),) \
+        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults{suffix}')),) \
                      + confidence.DEFAULT_LOAD_ORDER
-        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order)
+        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order, format=confidence.YAML())
         self._hashtopolis_uri = self._cfg['hashtopolis_uri']
         self._api_endpoint = self._hashtopolis_uri + '/api/server.php'