From 331beac13423fcce367fecf14bfb1fe159441e25 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Thu, 14 Mar 2019 16:26:57 -0300 Subject: [PATCH] #153 Fix unit test for upload recipe Signed-off-by: Uilian Ries --- cpt/test/test_client/upload_checks_test.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cpt/test/test_client/upload_checks_test.py b/cpt/test/test_client/upload_checks_test.py index 57244dc4..bbbd7b02 100644 --- a/cpt/test/test_client/upload_checks_test.py +++ b/cpt/test/test_client/upload_checks_test.py @@ -103,8 +103,6 @@ def test_upload_when_tag_is_true(self): self.assertIn("Uploading package 1/1: 5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9 to 'default'", tc.out) def test_upload_only_recipe(self): - """ When CONAN_UPLOAD_ONLY_RECIPE is TRUE, binary must not be uploaded. - """ ts = TestServer(users={"user": "password"}) tc = TestClient(servers={"default": ts}, users={"default": [("user", "password")]}) tc.save({"conanfile.py": self.conanfile}) @@ -118,9 +116,9 @@ def test_upload_only_recipe(self): mulitpackager.add({}, {"shared": False}) mulitpackager.run() - self.assertIn(" Uploading packages for 'lib/1.0@user/testing'", tc.out) - self.assertIn("Uploading lib/1.0@user/testing to remote", tc.out) - self.assertIn("Uploaded conan recipe 'lib/1.0@user/testing'", tc.out) + self.assertIn(" Uploading packages for 'lib/1.0@user/mychannel'", tc.out) + self.assertIn("Uploading lib/1.0@user/mychannel to remote", tc.out) + self.assertIn("Uploaded conan recipe 'lib/1.0@user/mychannel'", tc.out) self.assertNotIn("Uploading package 1/2", tc.out) self.assertNotIn("Uploading package 2/2", tc.out) @@ -133,8 +131,8 @@ def test_upload_only_recipe(self): mulitpackager.add({}, {"shared": False}) mulitpackager.run() - self.assertIn(" Uploading packages for 'lib/1.0@user/testing'", tc.out) - self.assertIn("Uploading lib/1.0@user/testing to remote", tc.out) + self.assertIn(" Uploading packages for 'lib/1.0@user/mychannel'", tc.out) + self.assertIn("Uploading lib/1.0@user/mychannel to remote", tc.out) self.assertIn("Recipe is up to date, upload skipped", tc.out) self.assertIn("Uploading package 1/2", tc.out) self.assertIn("Uploading package 2/2", tc.out)