commit: 48c2af4538d581fb2225c0ac9620b7fcfe4eae2e
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Dec 2 01:16:34 2015 +0000
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org>
CommitDate: Wed Dec 2 01:16:34 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=48c2af45
Respect PYTHONDONTWRITEBYTECODE in test suite.
pym/portage/package/ebuild/_config/special_env_vars.py | 2 +-
pym/portage/tests/dbapi/test_portdb_cache.py | 3 ++-
pym/portage/tests/ebuild/test_doebuild_fd_pipes.py | 3 ++-
pym/portage/tests/ebuild/test_doebuild_spawn.py | 3 ++-
pym/portage/tests/ebuild/test_ipc_daemon.py | 3 ++-
pym/portage/tests/emerge/test_config_protect.py | 3 ++-
pym/portage/tests/emerge/test_emerge_slot_abi.py | 3 ++-
pym/portage/tests/emerge/test_simple.py | 3 ++-
pym/portage/tests/repoman/test_simple.py | 3 ++-
pym/portage/tests/sync/test_sync_local.py | 3 ++-
10 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py
b/pym/portage/package/ebuild/_config/special_env_vars.py
index 8479cf5..9ae53c1 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -77,7 +77,7 @@ environ_whitelist += [
"PORTAGE_SIGPIPE_STATUS", "PORTAGE_SOCKS5_PROXY",
"PORTAGE_TMPDIR", "PORTAGE_UPDATE_ENV", "PORTAGE_USERNAME",
"PORTAGE_VERBOSE", "PORTAGE_WORKDIR_MODE", "PORTAGE_XATTR_EXCLUDE",
- "PORTDIR", "PORTDIR_OVERLAY", "PREROOTPATH",
+ "PORTDIR", "PORTDIR_OVERLAY", "PREROOTPATH", "PYTHONDONTWRITEBYTECODE",
"REPLACING_VERSIONS", "REPLACED_BY_VERSION",
"ROOT", "ROOTPATH", "T", "TMP", "TMPDIR",
"USE_EXPAND", "USE_ORDER", "WORKDIR",
diff --git a/pym/portage/tests/dbapi/test_portdb_cache.py
b/pym/portage/tests/dbapi/test_portdb_cache.py
index 5ac9b03..bd93446 100644
--- a/pym/portage/tests/dbapi/test_portdb_cache.py
+++ b/pym/portage/tests/dbapi/test_portdb_cache.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2014 Gentoo Foundation
+# Copyright 2012-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import subprocess
@@ -134,6 +134,7 @@ class PortdbCacheTestCase(TestCase):
"PORTAGE_OVERRIDE_EPREFIX" : eprefix,
"PORTAGE_PYTHON" : portage_python,
"PORTAGE_REPOSITORIES" :
settings.repositories.config_string(),
+ "PYTHONDONTWRITEBYTECODE" :
os.environ.get("PYTHONDONTWRITEBYTECODE", ""),
"PYTHONPATH" : pythonpath,
}
diff --git a/pym/portage/tests/ebuild/test_doebuild_fd_pipes.py
b/pym/portage/tests/ebuild/test_doebuild_fd_pipes.py
index 61392dd..2a65537 100644
--- a/pym/portage/tests/ebuild/test_doebuild_fd_pipes.py
+++ b/pym/portage/tests/ebuild/test_doebuild_fd_pipes.py
@@ -1,4 +1,4 @@
-# Copyright 2013 Gentoo Foundation
+# Copyright 2013-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import textwrap
@@ -75,6 +75,7 @@ class DoebuildFdPipesTestCase(TestCase):
settings.features.add("test")
settings['PORTAGE_PYTHON'] = portage._python_interpreter
settings['PORTAGE_QUIET'] = "1"
+ settings['PYTHONDONTWRITEBYTECODE'] =
os.environ.get("PYTHONDONTWRITEBYTECODE", "")
fake_bin = os.path.join(settings["EPREFIX"], "bin")
portage.util.ensure_dirs(fake_bin)
diff --git a/pym/portage/tests/ebuild/test_doebuild_spawn.py
b/pym/portage/tests/ebuild/test_doebuild_spawn.py
index ae9a5c5..6b34465 100644
--- a/pym/portage/tests/ebuild/test_doebuild_spawn.py
+++ b/pym/portage/tests/ebuild/test_doebuild_spawn.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2012 Gentoo Foundation
+# Copyright 2010-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import textwrap
@@ -65,6 +65,7 @@ class DoebuildSpawnTestCase(TestCase):
settings['PORTAGE_PYTHON'] = _python_interpreter
settings['PORTAGE_BUILDDIR'] = os.path.join(
settings['PORTAGE_TMPDIR'], cpv)
+ settings['PYTHONDONTWRITEBYTECODE'] =
os.environ.get('PYTHONDONTWRITEBYTECODE', '')
settings['T'] = os.path.join(
settings['PORTAGE_BUILDDIR'], 'temp')
for x in ('PORTAGE_BUILDDIR', 'T'):
diff --git a/pym/portage/tests/ebuild/test_ipc_daemon.py
b/pym/portage/tests/ebuild/test_ipc_daemon.py
index a871076..835f51f 100644
--- a/pym/portage/tests/ebuild/test_ipc_daemon.py
+++ b/pym/portage/tests/ebuild/test_ipc_daemon.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2012 Gentoo Foundation
+# Copyright 2010-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import tempfile
@@ -51,6 +51,7 @@ class IpcDaemonTestCase(TestCase):
env['PORTAGE_BIN_PATH'] = PORTAGE_BIN_PATH
env['PORTAGE_PYM_PATH'] = PORTAGE_PYM_PATH
env['PORTAGE_BUILDDIR'] = os.path.join(tmpdir, 'cat',
'pkg-1')
+ env['PYTHONDONTWRITEBYTECODE'] =
os.environ.get('PYTHONDONTWRITEBYTECODE', '')
if "__PORTAGE_TEST_HARDLINK_LOCKS" in os.environ:
env["__PORTAGE_TEST_HARDLINK_LOCKS"] = \
diff --git a/pym/portage/tests/emerge/test_config_protect.py
b/pym/portage/tests/emerge/test_config_protect.py
index 5d7d8e9..06ab059 100644
--- a/pym/portage/tests/emerge/test_config_protect.py
+++ b/pym/portage/tests/emerge/test_config_protect.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Gentoo Foundation
+# Copyright 2014-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import unicode_literals
@@ -222,6 +222,7 @@ src_install() {
"PORTAGE_PYTHON" : portage_python,
"PORTAGE_REPOSITORIES" :
settings.repositories.config_string(),
"PORTAGE_TMPDIR" : portage_tmpdir,
+ "PYTHONDONTWRITEBYTECODE" :
os.environ.get("PYTHONDONTWRITEBYTECODE", ""),
"PYTHONPATH" : pythonpath,
"__PORTAGE_TEST_PATH_OVERRIDE" : fake_bin,
}
diff --git a/pym/portage/tests/emerge/test_emerge_slot_abi.py
b/pym/portage/tests/emerge/test_emerge_slot_abi.py
index d1f2d92..2006993 100644
--- a/pym/portage/tests/emerge/test_emerge_slot_abi.py
+++ b/pym/portage/tests/emerge/test_emerge_slot_abi.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2014 Gentoo Foundation
+# Copyright 2012-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import subprocess
@@ -119,6 +119,7 @@ class SlotAbiEmergeTestCase(TestCase):
"PATH" : path,
"PORTAGE_PYTHON" : portage_python,
"PORTAGE_REPOSITORIES" :
settings.repositories.config_string(),
+ "PYTHONDONTWRITEBYTECODE" :
os.environ.get("PYTHONDONTWRITEBYTECODE", ""),
"PYTHONPATH" : pythonpath,
}
diff --git a/pym/portage/tests/emerge/test_simple.py
b/pym/portage/tests/emerge/test_simple.py
index 0101362..394ed43 100644
--- a/pym/portage/tests/emerge/test_simple.py
+++ b/pym/portage/tests/emerge/test_simple.py
@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Gentoo Foundation
+# Copyright 2011-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import subprocess
@@ -369,6 +369,7 @@ pkg_preinst() {
"PORTAGE_PYTHON" : portage_python,
"PORTAGE_REPOSITORIES" :
settings.repositories.config_string(),
"PORTAGE_TMPDIR" : portage_tmpdir,
+ "PYTHONDONTWRITEBYTECODE" :
os.environ.get("PYTHONDONTWRITEBYTECODE", ""),
"PYTHONPATH" : pythonpath,
"__PORTAGE_TEST_PATH_OVERRIDE" : fake_bin,
}
diff --git a/pym/portage/tests/repoman/test_simple.py
b/pym/portage/tests/repoman/test_simple.py
index f41f057..af6f95d 100644
--- a/pym/portage/tests/repoman/test_simple.py
+++ b/pym/portage/tests/repoman/test_simple.py
@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Gentoo Foundation
+# Copyright 2011-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import subprocess
@@ -229,6 +229,7 @@ class SimpleRepomanTestCase(TestCase):
"PORTAGE_GRPNAME" : os.environ["PORTAGE_GRPNAME"],
"PORTAGE_USERNAME" : os.environ["PORTAGE_USERNAME"],
"PORTAGE_REPOSITORIES" :
settings.repositories.config_string(),
+ "PYTHONDONTWRITEBYTECODE" :
os.environ.get("PYTHONDONTWRITEBYTECODE", ""),
"PYTHONPATH" : pythonpath,
}
diff --git a/pym/portage/tests/sync/test_sync_local.py
b/pym/portage/tests/sync/test_sync_local.py
index 7753a26..b57bdba 100644
--- a/pym/portage/tests/sync/test_sync_local.py
+++ b/pym/portage/tests/sync/test_sync_local.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Gentoo Foundation
+# Copyright 2014-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import subprocess
@@ -194,6 +194,7 @@ class SyncLocalTestCase(TestCase):
"PATH" : os.environ["PATH"],
"PORTAGE_GRPNAME" : os.environ["PORTAGE_GRPNAME"],
"PORTAGE_USERNAME" : os.environ["PORTAGE_USERNAME"],
+ "PYTHONDONTWRITEBYTECODE" :
os.environ.get("PYTHONDONTWRITEBYTECODE", ""),
"PYTHONPATH" : pythonpath,
}
repos_set_conf("rsync")
