commit 15d104be0c752b801935d34d858adb45a96496a1
author David Burger <dburger@chromium.org> Tue Jan 21 21:03:13 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Jan 23 01:50:47 2020 +0000
tree c3ffb2fcd8a8386ba97225d6f60439859b708a36
parent 5d2edcb02c51e5afbee9ad468e36c1d76c98b9d4

PUpr uprev, fix uprev_ebuild_from_pin.

Fix PUpr uprev usage of uprev_ebuild_from_pin. Modified files includes
old file name so that it is correctly processed by the generator recipe
in the commit.

TEST=./run_tests
BUG=None

Change-Id: I85357da80834e8bc17895be426a2a03cba1c3d37
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2014157
Reviewed-by: Trent Begin <tbegin@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Tested-by: David Burger <dburger@chromium.org>
Commit-Queue: Trent Begin <tbegin@chromium.org>

service/packages_unittest.py

diff --git a/service/packages_unittest.py b/service/packages_unittest.py
index 4133b4c..1a30fe1 100644
--- a/service/packages_unittest.py
+++ b/service/packages_unittest.py
@@ -132,13 +132,18 @@
     mod = result.modified[0]
     self.assertEqual(mod.new_version, self.new_version,
                      'unexpected version number: %s' % mod.new_version)
-    self.assertEqual(len(mod.files), 1,
+    self.assertEqual(len(mod.files), 2,
                      'unexpected number of modified files: %s' % len(mod.files))
 
+    old_ebuild_path = os.path.join(package_path,
+                                   self.ebuild_template % self.version)
+    self.assertEqual(mod.files[0], old_ebuild_path,
+                     'unexpected deleted ebuild file: %s' % mod.files[0])
+
     new_ebuild_path = os.path.join(package_path,
                                    self.ebuild_template % self.new_version)
-    self.assertEqual(mod.files[0], new_ebuild_path,
-                     'unexpected updated ebuild file: %s' % mod.files[0])
+    self.assertEqual(mod.files[1], new_ebuild_path,
+                     'unexpected updated ebuild file: %s' % mod.files[1])
 
   def test_no_ebuild(self):
     """Tests assertion is raised if package has no ebuilds"""