Skip to main content

Source code Changes To

pkg-gate / src / tests / cli / t_pkgrecv.py

From revision 2955 to 2958:

diff -r 796cde775790 -r 868e07939116 src/tests/cli/t_pkgrecv.py
--- a/src/tests/cli/t_pkgrecv.py	Fri Sep 27 10:19:27 2013 +1200
+++ b/src/tests/cli/t_pkgrecv.py	Fri Sep 27 11:38:34 2013 -0700
@@ -197,15 +197,19 @@
                 # Test list newest.
                 self.pkgrecv(self.durl1, "--newest")
                 output = self.reduceSpaces(self.output)
+                
+                def  _nobuild_fmri(pfmri):
+                        return fmri.PkgFmri(pfmri).get_fmri(
+                            include_build=False)
 
                 # The latest version of amber and bronze should be listed
                 # (sans publisher prefix currently).
-                amber = self.published[1]
-                scheme = self.published[8]
-                bronze = self.published[4]
-                tree = self.published[5]
-                branch = self.published[6]
-                leaf = self.published[7]
+                amber = _nobuild_fmri(self.published[1])
+                scheme = _nobuild_fmri(self.published[8])
+                bronze = _nobuild_fmri(self.published[4])
+                tree = _nobuild_fmri(self.published[5])
+                branch = _nobuild_fmri(self.published[6])
+                leaf = _nobuild_fmri(self.published[7])
 
                 expected = "\n".join((amber, branch, bronze, leaf, scheme, tree)) + "\n"
                 self.assertEqualDiff(expected, output)

 
 
Close
loading
Please Confirm
Close