diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-26 00:12:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-26 00:12:36 +0000 |
| commit | ca1f1d39b8ee85f55d5b656f7db946f855be5cb2 (patch) | |
| tree | 98cd324302662b3e27392ff0d2dbf0b78319cfc6 /nova | |
| parent | 060c58ea65cfc5224e6e93059dda682e5e7ce806 (diff) | |
| parent | cf99107321c891565ab97f49193b81419abf3d66 (diff) | |
| download | nova-ca1f1d39b8ee85f55d5b656f7db946f855be5cb2.tar.gz nova-ca1f1d39b8ee85f55d5b656f7db946f855be5cb2.tar.xz nova-ca1f1d39b8ee85f55d5b656f7db946f855be5cb2.zip | |
Merge "Another killfilter test fix for Fedora 17."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/test_nova_rootwrap.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/test_nova_rootwrap.py b/nova/tests/test_nova_rootwrap.py index 2b6fba975..f816cbdb9 100644 --- a/nova/tests/test_nova_rootwrap.py +++ b/nova/tests/test_nova_rootwrap.py @@ -89,7 +89,7 @@ class RootwrapTestCase(test.TestCase): self.assertFalse(f.match(usercmd) or f2.match(usercmd)) usercmd = ['kill', p.pid] # Providing no signal should work - self.assertTrue(f.match(usercmd)) + self.assertTrue(f.match(usercmd) or f2.match(usercmd)) def test_KillFilter_no_raise(self): """Makes sure ValueError from bug 926412 is gone""" |