From 06d258a3f93ed66b0b84cd2c92960cde57407a32 Mon Sep 17 00:00:00 2001 From: Alec Warner Date: Sat, 10 Feb 2007 04:46:23 +0000 Subject: [PATCH] fix a few broken tests svn path=/main/trunk/; revision=5935 --- pym/portage/tests/__init__.py | 2 +- pym/portage/tests/dep/test_dep_getusedeps.py | 5 ++--- pym/portage/tests/dep/test_get_operator.py | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py index 3a881348a..5a69ae3ed 100644 --- a/pym/portage/tests/__init__.py +++ b/pym/portage/tests/__init__.py @@ -49,7 +49,7 @@ def getTests( path, base_path ): raise return result -test_cpvs = ['sys-apps/portage','virtual/portage'] +test_cps = ['sys-apps/portage','virtual/portage'] test_versions = ['1.0', '1.0-r1','2.3_p4','1.0_alpha57'] test_slots = [ None, '1','gentoo-sources-2.6.17','spankywashere'] test_usedeps = ['foo','-bar', ['foo','bar'],['foo','-bar'] ] diff --git a/pym/portage/tests/dep/test_dep_getusedeps.py b/pym/portage/tests/dep/test_dep_getusedeps.py index d191d43cc..309c659f5 100644 --- a/pym/portage/tests/dep/test_dep_getusedeps.py +++ b/pym/portage/tests/dep/test_dep_getusedeps.py @@ -7,7 +7,7 @@ from unittest import TestCase from portage.dep import dep_getusedeps import sys -from portage.tests import test_cpvs, test_slots, test_versions, test_usedeps +from portage.tests import test_cps, test_slots, test_versions, test_usedeps class DepGetUseDeps(TestCase): """ A simple testcase for dep_getusedeps @@ -15,8 +15,7 @@ class DepGetUseDeps(TestCase): def testDepGetUseDeps(self): - - for mycpv in test_cpvs: + for mycpv in test_cps: for version in test_versions: for slot in test_slots: for use in test_usedeps: diff --git a/pym/portage/tests/dep/test_get_operator.py b/pym/portage/tests/dep/test_get_operator.py index b41fab0d5..e5b5b7e6c 100644 --- a/pym/portage/tests/dep/test_get_operator.py +++ b/pym/portage/tests/dep/test_get_operator.py @@ -1,5 +1,5 @@ -# test_match_from_list.py -- Portage Unit Testing Functionality -# Copyright 2006 Gentoo Foundation +# test_get_operator.py -- Portage Unit Testing Functionality +# Copyright 2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -- 2.26.2