17355511 pkg info displays human-version even when identical to actual version s12b30
authorXiaobo Shen <xiaobo.shen@oracle.com>
Fri, 30 Aug 2013 13:27:39 -0700
changeset 2940 0e5359bd88dd
parent 2937 ef991e02b8b3
child 2941 390ea920c1b1
17355511 pkg info displays human-version even when identical to actual version
src/client.py
src/tests/cli/t_pkg_info.py
--- a/src/client.py	Mon Aug 26 14:17:35 2013 -0700
+++ b/src/client.py	Fri Aug 30 13:27:39 2013 -0700
@@ -2997,7 +2997,7 @@
                 # XXX even more info on the publisher would be nice?
                 msg(_("     Publisher:"), pi.publisher)
                 hum_ver = pi.get_attr_values("pkg.human-version")
-                if hum_ver and hum_ver[0] != pi.version:
+                if hum_ver and hum_ver[0] != str(pi.version):
                         msg(_("       Version:"), "%s (%s)" %
                             (pi.version, hum_ver[0]))
                 else:
--- a/src/tests/cli/t_pkg_info.py	Mon Aug 26 14:17:35 2013 -0700
+++ b/src/tests/cli/t_pkg_info.py	Fri Aug 30 13:27:39 2013 -0700
@@ -75,6 +75,12 @@
             close
         """
 
+        human2 = """
+            open [email protected],5.11-0:20110908T004546Z
+            add set name=pkg.human-version value=0.9.8.18
+            close
+        """
+
         misc_files = [ "tmp/bronzeA1",  "tmp/bronzeA2", "tmp/bronze1",
             "tmp/bronze2", "tmp/copyright1", "tmp/copyright0", "tmp/sh",
             "tmp/baz"]
@@ -92,7 +98,8 @@
                 pkg5unittest.SingleDepotTestCase.setUp(self)
                 self.make_misc_files(self.misc_files)
                 self.plist = self.pkgsend_bulk(self.rurl, (self.badfile10,
-                    self.baddir10, self.bronze10, self.bronze05, self.human))
+                    self.baddir10, self.bronze10, self.bronze05, self.human,
+                    self.human2))
 
         def test_pkg_info_bad_fmri(self):
                 """Test bad frmi's with pkg info."""
@@ -313,11 +320,16 @@
 
         def test_human_version(self):
                 """Verify that info returns the expected output for packages
-                with a human-readable version defined."""
+                with a human-readable version defined. If it is the same as
+                version number, then only version number is displayed"""
 
                 self.image_create(self.rurl)
                 self.pkg("info -r human | grep 'Version: 0.9.8.18 (0.9.8r)'")
 
+                # Verify that human version number should not be displayed
+                # if it is identical to the version number.
+                self.pkg("info -r human2 | grep 'Version: 0.9.8.18$'")
+
         def test_ranked(self):
                 """Verify that pkg info -r returns expected results when
                 multiple publishers provide the same package based on