From cb01a200f9aee6becf4c3e92a3f9dfec7745b45f Mon Sep 17 00:00:00 2001 From: Dmitry Arkhipov Date: Tue, 26 Mar 2019 12:42:11 +0300 Subject: [PATCH] add remotes in constructor --- cpt/packager.py | 2 +- cpt/runner.py | 1 - cpt/test/unit/packager_test.py | 10 ++-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/cpt/packager.py b/cpt/packager.py index 1cc6600e..8ca1ec9d 100644 --- a/cpt/packager.py +++ b/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) @@ -457,7 +458,6 @@ def run(self, base_profile_name=None): self.printer.print_message("Skipped builds due [skip ci] commit message") return 99 if not self.skip_check_credentials and self._upload_enabled(): - self.remotes_manager.add_remotes_to_conan() self.auth_manager.login(self.remotes_manager.upload_remote_name) if self.conan_pip_package and not self.use_docker: with self.printer.foldable_output("pip_update"): diff --git a/cpt/runner.py b/cpt/runner.py index e8ef1c95..18bf7bd5 100644 --- a/cpt/runner.py +++ b/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 diff --git a/cpt/test/unit/packager_test.py b/cpt/test/unit/packager_test.py index adf1061e..c3f7335e 100644 --- a/cpt/test/unit/packager_test.py +++ b/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) @@ -710,7 +704,7 @@ def test_check_credentials(self): # When activated, check credentials before to create the profiles self.assertEqual(self.conan_api.calls[2].name, 'authenticate') - self.assertEqual(self.conan_api.calls[5].name, 'create_profile') + self.assertEqual(self.conan_api.calls[3].name, 'create_profile') self.conan_api = MockConanAPI() # If we skip the credentials check, the login will be performed just before the upload @@ -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[2].name, 'authenticate') # No upload, no authenticate self.conan_api = MockConanAPI()