diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-03-23 09:09:23 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-03-23 09:09:23 +0100 |
| commit | 3069e43edca71776a4f9e5f5e7f53d473c397695 (patch) | |
| tree | 90123ab717367f6e137b7cfb56318dbffd54c1e8 /tests | |
| parent | 85238ea03cd35b48a90a2fc1f63f2cf05d5b83b4 (diff) | |
| parent | 95112f12cea6ec54aaa8b5e372ee158a300f8967 (diff) | |
| download | python-apt-3069e43edca71776a4f9e5f5e7f53d473c397695.tar.gz | |
merge from debian-sid
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_all.py | 2 | ||||
| -rw-r--r-- | tests/test_aptsources.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/test_all.py b/tests/test_all.py index dc603dfd..d561a9ae 100644 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -10,7 +10,7 @@ import unittest import sys if __name__ == '__main__': - print("[tests] Running on %s" % sys.version.replace("\n", "")) + sys.stderr.write("[tests] Running on %s\n" % sys.version.replace("\n", "")) os.chdir(os.path.dirname(__file__)) # Find the path to the built apt_pkg and apt_inst extensions if os.path.exists("../build"): diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index 0f7f078b..767f5244 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -14,6 +14,8 @@ class TestAptSources(unittest.TestCase): def setUp(self): apt_pkg.init_config() apt_pkg.init_system() + if apt_pkg.config["APT::Architecture"] not in ('i386', 'amd64'): + apt_pkg.config.set("APT::Architecture", "i386") apt_pkg.config.set("Dir::Etc", os.getcwd()) apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx") if os.path.exists("../build/data/templates"): |