Software Updater

Merge lp:~robru/update-manager/chroot-robustness into lp:update-manager

  1. chroot-robustness
  2. Merge into main
Proposed by Robert Bruce Park
Status: Merged
Merged at revision: 2534
Proposed branch: lp:~robru/update-manager/chroot-robustness
Merge into: lp:update-manager
Diff against target: 20 lines (+1/-2)
1 file modified
tests/test_utils.py (+1/-2)
To merge this branch: bzr merge lp:~robru/update-manager/chroot-robustness
Reviewer Review Type Date Requested Status
Michael Terry Approve
Review via email: mp+120239@code.launchpad.net

Description of the change

Drop requirement for test suite to be run as root.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Nice!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_utils.py'
2--- tests/test_utils.py 2012-07-03 17:26:54 +0000
3+++ tests/test_utils.py 2012-08-17 21:16:18 +0000
4@@ -7,7 +7,6 @@
5 import unittest
6
7 from UpdateManager.Core.utils import (
8- inside_chroot,
9 is_child_of_process_name,
10 get_string_with_no_auth_from_source_entry,
11 humanize_size,
12@@ -29,7 +28,7 @@
13 # in a upgrade context most of the time
14 self.assertEqual(humanize_size(1000 * 1000 * 1000), "1000.0 MB")
15
16- @unittest.skipIf(inside_chroot(), "inside chroot")
17+ @unittest.skipIf(not glob.glob("/boot/*"), "inside chroot")
18 def test_estimate_kernel_size(self):
19 estimate = estimate_kernel_size_in_boot()
20 self.assertTrue(estimate > 0)

Subscribers

People subscribed via source and target branches

to status/vote changes: