aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan Amicel <ronan.amicel@gmail.com>2012-09-12 04:40:26 +0200
committerRonan Amicel <ronan.amicel@gmail.com>2012-09-12 04:40:26 +0200
commitb8c6bca3c0d8fd891da58678b77486a8d0c1914f (patch)
tree1e3dc578ffbb812cd4ad1dc516165c7c63eca4b8
parentFix require MySQL server on Ubuntu 12.04 LTS (diff)
downloadfabtools-b8c6bca3c0d8fd891da58678b77486a8d0c1914f.tar.xz
Fix OpenVZ integration test
-rw-r--r--fabtools/tests/fabfiles/openvz.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/fabtools/tests/fabfiles/openvz.py b/fabtools/tests/fabfiles/openvz.py
index d67cad4..b8945e0 100644
--- a/fabtools/tests/fabfiles/openvz.py
+++ b/fabtools/tests/fabfiles/openvz.py
@@ -8,13 +8,17 @@ from fabtools import require
import fabtools
-from fabtools.vagrant import vagrant
from fabtools.openvz import guest
from fabtools.require.openvz import container
@task
def test_openvz():
+
+ # Skip test if the kernel does not support OpenVZ
+ if not fabtools.files.is_dir('/proc/vz'):
+ return
+
setup_networking()
setup_containers()
@@ -42,7 +46,7 @@ def setup_firewall():
zones = [
{
- 'NAME': 'fw',
+ 'name': 'fw',
'type': 'firewall',
},
{