diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-04 20:27:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-04 20:27:10 +0000 |
| commit | 51f5b8c28e37af4ab7c86e5b4ed8a3be0460fe32 (patch) | |
| tree | 54e4c65253a969c6b2d7a94b721ee74ac86af656 /nova/tests | |
| parent | ce4dbbd7d5d9a1266b194ae0ae5f923697d36318 (diff) | |
| parent | c6568b78e46be5eadeec71714e516ca2e9161326 (diff) | |
Merge "Skip tests in OSX due to readlink compat"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_virt.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py index 8646b86b1..166e87d8b 100644 --- a/nova/tests/test_virt.py +++ b/nova/tests/test_virt.py @@ -16,6 +16,7 @@ # under the License. import os +import platform from nova import exception from nova import flags @@ -165,22 +166,26 @@ class TestVirtDiskPaths(test.TestCase): self.stubs.Set(utils, 'execute', nonroot_execute) + @test.skip_unless(platform.mac_ver()[0] == '', "Unable to test on OSX") def test_check_safe_path(self): ret = disk_api._join_and_check_path_within_fs('/foo', 'etc', 'something.conf') self.assertEquals(ret, '/foo/etc/something.conf') + @test.skip_unless(platform.mac_ver()[0] == '', "Unable to test on OSX") def test_check_unsafe_path(self): self.assertRaises(exception.Invalid, disk_api._join_and_check_path_within_fs, '/foo', 'etc/../../../something.conf') + @test.skip_unless(platform.mac_ver()[0] == '', "Unable to test on OSX") def test_inject_files_with_bad_path(self): self.assertRaises(exception.Invalid, disk_api._inject_file_into_fs, '/tmp', '/etc/../../../../etc/passwd', 'hax') + @test.skip_unless(platform.mac_ver()[0] == '', "Unable to test on OSX") def test_inject_metadata(self): with utils.tempdir() as tmpdir: meta_objs = [{"key": "foo", "value": "bar"}] |