add remotes in constructor

Author: grisumbras

cpt/packager.py

@@ -148,6 +148,7 @@ def __init__(self, username=None, channel=None, runner=None,
 
         self.upload_only_recipe = upload_only_recipe or get_bool_from_env("CONAN_UPLOAD_ONLY_RECIPE")
 
+        self.remotes_manager.add_remotes_to_conan()
         self.uploader = Uploader(self.conan_api, self.remotes_manager, self.auth_manager,
                                  self.printer, self.upload_retry)
 

cpt/runner.py

@@ -29,7 +29,6 @@ def __init__(self, profile_abs_path, reference, conan_api, uploader,
         self._exclude_vcvars_precommand = exclude_vcvars_precommand
         self._build_policy = build_policy
         self._runner = PrintRunner(runner or os.system, self.printer)
-        self._uploader.remote_manager.add_remotes_to_conan()
         self._test_folder = test_folder
         self._config_url = config_url
         self._upload_only_recipe = upload_only_recipe

cpt/test/unit/packager_test.py

@@ -469,8 +469,6 @@ def test_remotes(self):
                                      reference="lib/1.0@lasote/mychannel",
                                      ci_manager=self.ci_manager)
 
-        builder.add({}, {}, {}, {})
-        builder.run_builds()
         self.assertEquals(self.conan_api.calls[1].args[1], "url1")
         self.assertEquals(self.conan_api.calls[1].kwargs["insert"], -1)
         self.assertEquals(self.conan_api.calls[3].args[1], "url2")
@@ -485,8 +483,6 @@ def test_remotes(self):
                                      reference="lib/1.0@lasote/mychannel",
                                      ci_manager=self.ci_manager)
 
-        builder.add({}, {}, {}, {})
-        builder.run_builds()
         self.assertEquals(self.conan_api.calls[1].args[1], "myurl1")
         self.assertEquals(self.conan_api.calls[1].kwargs["insert"], -1)
 
@@ -502,8 +498,6 @@ def test_remotes(self):
                                      reference="lib/1.0@lasote/mychannel",
                                      ci_manager=self.ci_manager)
 
-        builder.add({}, {}, {}, {})
-        builder.run_builds()
         self.assertEquals(self.conan_api.calls[1].args[0], "my_cool_name1")
         self.assertEquals(self.conan_api.calls[1].args[1], "u1")
         self.assertEquals(self.conan_api.calls[1].kwargs["insert"], -1)
@@ -709,7 +703,7 @@ def test_check_credentials(self):
         builder.run()
 
         # When activated, check credentials before to create the profiles
-        self.assertEqual(self.conan_api.calls[2].name, 'authenticate')
+        self.assertEqual(self.conan_api.calls[4].name, 'authenticate')
         self.assertEqual(self.conan_api.calls[5].name, 'create_profile')
 
         self.conan_api = MockConanAPI()
@@ -725,7 +719,7 @@ def test_check_credentials(self):
                                      ci_manager=self.ci_manager)
         builder.add_common_builds()
         builder.run()
-        self.assertNotEqual(self.conan_api.calls[0].name, 'authenticate')
+        self.assertNotEqual(self.conan_api.calls[4].name, 'authenticate')
 
         # No upload, no authenticate
         self.conan_api = MockConanAPI()