--- a/src/tests/cli/t_pkgdep.py Fri Sep 09 15:21:40 2011 -0700
+++ b/src/tests/cli/t_pkgdep.py Fri Sep 09 15:28:30 2011 -0700
@@ -1152,181 +1152,6 @@
portable.remove(tp)
- def test_python_combinations(self):
- """Test that each line in the following table is accounted for
- by a test case.
-
- There are three conditions which determine whether python
- dependency analysis is performed on a file with python in its
- #! line.
- 1) Is the file executable.
- (Represented in the table below by X)
- 2) Is the file installed into a directory which provides
- information about what version of python should be used
- for it.
- (Represented by D)
- 3) Does the first line of the file include a specific version
- of python.
- (Represented by F)
-
- Conditions || Perform Analysis
- X D F || Y, if F and D disagree, display a warning in the
- || output and use D to analyze the file.
- X D !F || Y
- X !D F || Y
- X !D !F || N, and display a warning in the output.
- !X D F || Y
- !X D !F || Y
- !X !D F || N
- !X !D !F || N
- """
-
- # The test for line 1 with matching versions is done by
- # test_bug_13059.
-
- # Test line 1 (X D F) with mismatched versions.
- tp = self.make_manifest(self.pyver_test_manf_1 %
- {"py_ver":"2.4"})
- fp = "usr/lib/python2.4/vendor-packages/pkg/client/indexer.py"
- self.make_proto_text_file(fp, self.pyver_python_text % "2.6")
- self.pkgdepend_generate("-d %s %s" % (self.test_proto_dir, tp),
- exit=1)
- self.check_res(self.pyver_mismatch_results +
- self.make_pyver_python_res("2.4", self.test_proto_dir, fp,
- include_os=True) % {"bin_ver": "2.6"},
- self.output)
- self.check_res(self.pyver_mismatch_errs % self.test_proto_dir,
- self.errout)
-
- # Test line 2 (X D !F)
- tp = self.make_manifest(self.pyver_test_manf_1 %
- {"py_ver":"2.4"})
- fp = "usr/lib/python2.4/vendor-packages/pkg/client/indexer.py"
- self.make_proto_text_file(fp, self.pyver_python_text % "")
- self.pkgdepend_generate("-m -d %s %s" %
- (self.test_proto_dir, tp))
- self.check_res(
- self.pyver_res_full_manf_1("2.4", self.test_proto_dir, fp,
- include_os=True) % {"reason": fp, "bin_ver": ""},
- self.output)
- self.check_res("", self.errout)
-
- # Test line 3 (X !D F)
- tp = self.make_manifest(self.py_in_usr_bin_manf)
- fp = "usr/bin/pkg"
- self.make_proto_text_file(fp, self.pyver_python_text % "2.4")
- self.pkgdepend_generate("-m -d %s %s" %
- (self.test_proto_dir, tp))
- self.check_res(
- self.pyver_res_full_manf_1("2.4", self.test_proto_dir, fp,
- include_os=True) % {"reason": fp, "bin_ver": "2.4"},
- self.output)
- self.check_res("", self.errout)
-
- # Test line 4 (X !D !F)
- tp = self.make_manifest(self.py_in_usr_bin_manf)
- fp = "usr/bin/pkg"
- self.make_proto_text_file(fp, self.pyver_python_text % "")
- self.pkgdepend_generate("-m -d %s %s" %
- (self.test_proto_dir, tp), exit=1)
- self.check_res(
- self.pyver_24_script_full_manf_1 %
- {"reason": fp, "bin_ver": ""},
- self.output)
- self.check_res(self.pyver_unspecified_ver_err %
- self.test_proto_dir, self.errout)
-
- # Test line 5 (!X D F)
- tp = self.make_manifest(self.pyver_test_manf_1_non_ex %
- {"py_ver":"2.4"})
- fp = "usr/lib/python2.4/vendor-packages/pkg/client/indexer.py"
- self.make_proto_text_file(fp, self.pyver_python_text % "2.6")
- self.pkgdepend_generate("-d %s %s" % (self.test_proto_dir, tp))
- self.check_res(
- self.make_pyver_python_res("2.4", self.test_proto_dir, fp,
- include_os=True),
- self.output)
- self.check_res("", self.errout)
-
- # Test line 6 (!X D !F)
- tp = self.make_manifest(self.pyver_test_manf_1_non_ex %
- {"py_ver":"2.4"})
- fp = "usr/lib/python2.4/vendor-packages/pkg/client/indexer.py"
- self.make_proto_text_file(fp, self.pyver_python_text % "")
- self.pkgdepend_generate("-d %s %s" % (self.test_proto_dir, tp))
- self.check_res(
- self.make_pyver_python_res("2.4", self.test_proto_dir, fp,
- include_os=True),
- self.output)
- self.check_res("", self.errout)
-
- # Test line 7 (!X !D F)
- tp = self.make_manifest(self.py_in_usr_bin_manf_non_ex)
- fp = "usr/bin/pkg"
- self.make_proto_text_file(fp, self.pyver_python_text % "2.4")
- self.pkgdepend_generate("-d %s %s" % (self.test_proto_dir, tp))
- self.check_res("", self.output)
- self.check_res("", self.errout)
-
- # Test line 8 (!X !D !F)
- tp = self.make_manifest(self.py_in_usr_bin_manf_non_ex)
- fp = "usr/bin/pkg"
- self.make_proto_text_file(fp, self.pyver_python_text % "")
- self.pkgdepend_generate("-d %s %s" % (self.test_proto_dir, tp))
- self.check_res("", self.output)
- self.check_res("", self.errout)
-
- def test_bug_13059(self):
- """Test that python modules written for a version of python
- other than the current system version are analyzed correctly."""
-
- for py_ver in ["2.4"]:
-
- # Set up the files for generate.
- tp = self.make_manifest(
- self.pyver_test_manf_1 % {"py_ver":py_ver})
- fp = "usr/lib/python%s/vendor-packages/pkg/" \
- "client/indexer.py" % py_ver
- self.make_proto_text_file(fp, self.python_text)
-
- # Run generate and check the output.
- self.pkgdepend_generate("-m -d %s %s" %
- (self.test_proto_dir, tp))
- self.check_res(
- self.pyver_res_full_manf_1(py_ver,
- self.test_proto_dir, fp) %
- {"bin_ver": "", "reason":fp},
- self.output)
- self.check_res("", self.errout)
-
- # Take the output from the run and make it a file
- # for the resolver to use.
- dependency_mp = self.make_manifest(self.output)
- provider_mp = self.make_manifest(
- self.pyver_resolve_dep_manf % {"py_ver":py_ver})
-
- # Run resolver and check the output.
- self.pkgdepend_resolve(
- "-v %s %s" % (dependency_mp, provider_mp))
- self.check_res("", self.output)
- self.check_res("", self.errout)
- dependency_res_p = dependency_mp + ".res"
- provider_res_p = provider_mp + ".res"
- lines = self.__read_file(dependency_res_p)
- self.check_res(self.pyver_resolve_results % {
- "res_manf": os.path.basename(provider_mp),
- "pfx":
- base.Dependency.DEPEND_DEBUG_PREFIX,
- "py_ver": py_ver,
- "reason": fp
- }, lines)
- lines = self.__read_file(provider_res_p)
- self.check_res("", lines)
-
- # Clean up
- portable.remove(dependency_res_p)
- portable.remove(provider_res_p)
-
def test_resolve_screen_out(self):
"""Check that the results printed to screen are what is
expected."""
@@ -2624,9 +2449,7 @@
def test_bug_18101(self):
"""Test that importing os.path in a file using the system python
- results in the right set of dependencies. The test
- test_python_combinations handles testing when python 2.4 is
- used."""
+ results in the right set of dependencies."""
# Set up the files for generate.
fp = "usr/lib/python2.6/vendor-packages/pkg/client/indexer.py"