From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3D9DA138334 for ; Thu, 5 Jul 2018 10:20:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDECEE09A5; Thu, 5 Jul 2018 10:20:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B492DE09A5 for ; Thu, 5 Jul 2018 10:20:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E919335C7F for ; Thu, 5 Jul 2018 10:20:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ECEFF2E5 for ; Thu, 5 Jul 2018 10:20:20 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1530785963.82823b0c4de0a7cbb5654bb19d63aef874800afd.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/sync/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/sync/test_sync_local.py X-VCS-Directories: pym/portage/tests/sync/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 82823b0c4de0a7cbb5654bb19d63aef874800afd X-VCS-Branch: master Date: Thu, 5 Jul 2018 10:20:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 68fb79cb-5426-4669-aaff-e011d9cb6623 X-Archives-Hash: 5d726f05b9f5e99bee6d7749cc2d0751 commit: 82823b0c4de0a7cbb5654bb19d63aef874800afd Author: Zac Medico gentoo org> AuthorDate: Thu Jul 5 10:18:55 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jul 5 10:19:23 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=82823b0c test_sync_local: fix GitSync coverage Fixes: 0655b4a26e37 ("test_sync_local: add test for auto-sync set to 'no'") pym/portage/tests/sync/test_sync_local.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pym/portage/tests/sync/test_sync_local.py b/pym/portage/tests/sync/test_sync_local.py index 010c8f887..17ff6f200 100644 --- a/pym/portage/tests/sync/test_sync_local.py +++ b/pym/portage/tests/sync/test_sync_local.py @@ -102,17 +102,20 @@ class SyncLocalTestCase(TestCase): os.unlink(os.path.join(metadata_dir, 'timestamp.chk')) sync_cmds = ( + (homedir, cmds["emerge"] + ("--sync",)), + (homedir, lambda: self.assertTrue(os.path.exists( + os.path.join(repo.location, "dev-libs", "A") + ), "dev-libs/A expected, but missing")), + (homedir, cmds["emaint"] + ("sync", "-A")), + ) + + sync_cmds_auto_sync = ( (homedir, lambda: repos_set_conf("rsync", auto_sync="no")), (homedir, cmds["emerge"] + ("--sync",)), (homedir, lambda: self.assertFalse(os.path.exists( os.path.join(repo.location, "dev-libs", "A") ), "dev-libs/A found, expected missing")), (homedir, lambda: repos_set_conf("rsync", auto_sync="yes")), - (homedir, cmds["emerge"] + ("--sync",)), - (homedir, lambda: self.assertTrue(os.path.exists( - os.path.join(repo.location, "dev-libs", "A") - ), "dev-libs/A expected, but missing")), - (homedir, cmds["emaint"] + ("sync", "-A")), ) rename_repo = ( @@ -236,7 +239,7 @@ class SyncLocalTestCase(TestCase): # triggered by python -Wd will be visible. stdout = subprocess.PIPE - for cwd, cmd in rename_repo + sync_cmds + \ + for cwd, cmd in rename_repo + sync_cmds_auto_sync + sync_cmds + \ rsync_opts_repos + rsync_opts_repos_default + \ rsync_opts_repos_default_ovr + rsync_opts_repos_default_cancel + \ delete_sync_repo + git_repo_create + sync_type_git + \