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 1SF6GE-00020N-0j for garchives@archives.gentoo.org; Tue, 03 Apr 2012 16:07:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4390E0DB9; Tue, 3 Apr 2012 16:06:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6F116E0DB9 for ; Tue, 3 Apr 2012 16:06:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A13D41B400B for ; Tue, 3 Apr 2012 16:06:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 64EF7E5403 for ; Tue, 3 Apr 2012 16:06:55 +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: <1333469198.c521bc87db7daf70a6c00272c6c7440059135b58.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/util/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/util/test_getconfig.py X-VCS-Directories: pym/portage/tests/util/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c521bc87db7daf70a6c00272c6c7440059135b58 X-VCS-Branch: master Date: Tue, 3 Apr 2012 16:06:55 +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: d186a243-eb90-4f8e-a3ca-eca58deb32e0 X-Archives-Hash: c7b1b873a4d981cdbff4c6d07b832b15 commit: c521bc87db7daf70a6c00272c6c7440059135b58 Author: Zac Medico gentoo org> AuthorDate: Tue Apr 3 16:06:38 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Apr 3 16:06:38 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc521bc87 test_getconfig: add case for bug #410625 --- pym/portage/tests/util/test_getconfig.py | 26 ++++++++++++++++++++++++= +- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/pym/portage/tests/util/test_getconfig.py b/pym/portage/tests= /util/test_getconfig.py index 00f7f52..f13b753 100644 --- a/pym/portage/tests/util/test_getconfig.py +++ b/pym/portage/tests/util/test_getconfig.py @@ -1,7 +1,10 @@ -# Copyright 2010 Gentoo Foundation +# Copyright 2010-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 +import tempfile + from portage import os +from portage import _unicode_encode from portage.const import PORTAGE_BASE_PATH from portage.tests import TestCase from portage.util import getconfig @@ -27,3 +30,24 @@ class GetConfigTestCase(TestCase): d =3D getconfig(make_globals_file) for k, v in self._cases.items(): self.assertEqual(d[k], v) + + def testGetConfigProfileEnv(self): + # Test the mode which is used to parse /etc/env.d and /etc/profile.env= . + + cases =3D { + 'LESS_TERMCAP_mb': "$\E[01;31m", # bug #410625 + } + + with tempfile.NamedTemporaryFile(mode=3D'wb') as f: + # Format like env_update formats /etc/profile.env. + for k, v in cases.items(): + if v.startswith('$') and not v.startswith('${'): + line =3D "export %s=3D$'%s'\n" % (k, v[1:]) + else: + line =3D "export %s=3D'%s'\n" % (k, v) + f.write(_unicode_encode(line)) + f.flush() + + d =3D getconfig(f.name, expand=3DFalse) + for k, v in cases.items(): + self.assertEqual(d.get(k), v)