Skip to main content

Source code Changes To

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

From revision 2955 to 2958:

diff -r 796cde775790 -r 868e07939116 src/tests/cli/t_pkgmerge.py
--- a/src/tests/cli/t_pkgmerge.py	Fri Sep 27 10:19:27 2013 +1200
+++ b/src/tests/cli/t_pkgmerge.py	Fri Sep 27 11:38:34 2013 -0700
@@ -543,7 +543,7 @@
                 # Verify the list of expected packages in the target repository.
                 nlist = {}
                 for s in self.published[:10]:
-                        f = fmri.PkgFmri(s, "5.11")
+                        f = fmri.PkgFmri(s)
                         if f.pkg_name not in nlist or \
                             f.version > nlist[f.pkg_name].version:
                                 nlist[f.pkg_name] = f
@@ -620,7 +620,7 @@
                 # Verify the list of expected packages in the target repository.
                 nlist = {}
                 for s in self.published:
-                        f = fmri.PkgFmri(s, "5.11")
+                        f = fmri.PkgFmri(s)
                         if f.pkg_name not in nlist or \
                             f.version > nlist[f.pkg_name].version:
                                 nlist[f.pkg_name] = f
@@ -766,7 +766,7 @@
                 # Verify the list of expected packages in the target repository.
                 nlist = {}
                 for s in self.published + self.published_debug:
-                        f = fmri.PkgFmri(s, "5.11")
+                        f = fmri.PkgFmri(s)
                         if f.pkg_name not in nlist or \
                             f.version > nlist[f.pkg_name].version:
                                 nlist[f.pkg_name] = f
@@ -870,7 +870,7 @@
                 # the missing cases.
                 nlist = {}
                 for s in self.published + self.published_debug[:6]:
-                        f = fmri.PkgFmri(s, "5.11")
+                        f = fmri.PkgFmri(s)
                         if f.pkg_name not in nlist or \
                             f.version > nlist[f.pkg_name].version:
                                 nlist[f.pkg_name] = f

 
 
Close
loading
Please Confirm
Close