From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rakyl-0000Gz-Q3 for garchives@archives.gentoo.org; Wed, 14 Dec 2011 09:18:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60B1C21C22D; Wed, 14 Dec 2011 09:18:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1E33521C22D for ; Wed, 14 Dec 2011 09:18:15 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 39EFF1B402D for ; Wed, 14 Dec 2011 09:18:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6BC008004A for ; Wed, 14 Dec 2011 09:18:13 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/locks/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/locks/test_asynchronous_lock.py pym/portage/tests/locks/test_lock_nonblock.py X-VCS-Directories: pym/portage/tests/locks/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b898440e35aa96cd50c74b13d26d5924d2d708ed Date: Wed, 14 Dec 2011 09:18:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 47a6b009-92b4-48f2-a6aa-f3d5e1f14f8b X-Archives-Hash: 75e28f8206268bc1880bb4dd71794086 commit: b898440e35aa96cd50c74b13d26d5924d2d708ed Author: Zac Medico gentoo org> AuthorDate: Wed Dec 14 09:17:16 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Dec 14 09:17:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db898440e tests/locks: save/restore global env state This ensures that global __PORTAGE_TEST_HARDLINK_LOCKS overrides work correctly for all tests. --- pym/portage/tests/locks/test_asynchronous_lock.py | 12 ++++++++++++ pym/portage/tests/locks/test_lock_nonblock.py | 3 +++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/pym/portage/tests/locks/test_asynchronous_lock.py b/pym/port= age/tests/locks/test_asynchronous_lock.py index c896cb4..49dd10e 100644 --- a/pym/portage/tests/locks/test_asynchronous_lock.py +++ b/pym/portage/tests/locks/test_asynchronous_lock.py @@ -43,11 +43,14 @@ class AsynchronousLockTestCase(TestCase): self._testAsynchronousLock() =20 def testAsynchronousLockHardlink(self): + prev_state =3D os.environ.pop("__PORTAGE_TEST_HARDLINK_LOCKS", None) os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] =3D "1" try: self._testAsynchronousLock() finally: os.environ.pop("__PORTAGE_TEST_HARDLINK_LOCKS", None) + if prev_state is not None: + os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] =3D prev_state =20 def _testAsynchronousLockWait(self): scheduler =3D PollScheduler().sched_iface @@ -81,11 +84,14 @@ class AsynchronousLockTestCase(TestCase): self._testAsynchronousLockWait() =20 def testAsynchronousLockWaitHardlink(self): + prev_state =3D os.environ.pop("__PORTAGE_TEST_HARDLINK_LOCKS", None) os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] =3D "1" try: self._testAsynchronousLockWait() finally: os.environ.pop("__PORTAGE_TEST_HARDLINK_LOCKS", None) + if prev_state is not None: + os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] =3D prev_state =20 def _testAsynchronousLockWaitCancel(self): scheduler =3D PollScheduler().sched_iface @@ -116,11 +122,14 @@ class AsynchronousLockTestCase(TestCase): self._testAsynchronousLockWaitCancel() =20 def testAsynchronousLockWaitCancelHardlink(self): + prev_state =3D os.environ.pop("__PORTAGE_TEST_HARDLINK_LOCKS", None) os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] =3D "1" try: self._testAsynchronousLockWaitCancel() finally: os.environ.pop("__PORTAGE_TEST_HARDLINK_LOCKS", None) + if prev_state is not None: + os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] =3D prev_state =20 def _testAsynchronousLockWaitKill(self): scheduler =3D PollScheduler().sched_iface @@ -157,8 +166,11 @@ class AsynchronousLockTestCase(TestCase): self._testAsynchronousLockWaitKill() =20 def testAsynchronousLockWaitKillHardlink(self): + prev_state =3D os.environ.pop("__PORTAGE_TEST_HARDLINK_LOCKS", None) os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] =3D "1" try: self._testAsynchronousLockWaitKill() finally: os.environ.pop("__PORTAGE_TEST_HARDLINK_LOCKS", None) + if prev_state is not None: + os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] =3D prev_state diff --git a/pym/portage/tests/locks/test_lock_nonblock.py b/pym/portage/= tests/locks/test_lock_nonblock.py index 914084c..17f854d 100644 --- a/pym/portage/tests/locks/test_lock_nonblock.py +++ b/pym/portage/tests/locks/test_lock_nonblock.py @@ -48,9 +48,12 @@ class LockNonblockTestCase(TestCase): self._testLockNonblock() =20 def testLockNonblockHardlink(self): + prev_state =3D os.environ.pop("__PORTAGE_TEST_HARDLINK_LOCKS", None) os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] =3D "1" try: self._testLockNonblock() finally: os.environ.pop("__PORTAGE_TEST_HARDLINK_LOCKS", None) + if prev_state is not None: + os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] =3D prev_state =20