Permalink
Browse files

some minor test updates

  • Loading branch information...
1 parent fff5f59 commit 70f943ef3b6b200ff59145228d7885ad1482960e @bretth committed Dec 19, 2010
Showing with 11 additions and 19 deletions.
  1. +1 −2 tests/fabfile.py
  2. +10 −13 tests/lin.py
  3. +0 −4 tests/vir.py
View
@@ -31,10 +31,9 @@
#from ubu import test_ubu_disable_root, test_ubu_change_ssh_port, test_ubu_port_is_open
#from ubu import test_ubu_setup_ufw, test_ubu_post_install_package, test_ubu_post_setupnode
-from vir import test_vir_post_deploy
from web import test_web_site_users
from lin import test_lin_add_repositories, test_lin_uninstall_packages
-from lin import test_lin_setup_ufw_rules
+from lin import test_lin_setup_ufw_rules, test_lin_disable_root
from dec import test_dec_run_once_per_node, test_dec_run_once_per_version
from dep import test_dep_backup_file
View
@@ -8,7 +8,7 @@
from woven.linux import disable_root, change_ssh_port, port_is_open, setup_ufw
from woven.linux import setup_ufw_rules
-from woven.linux import post_install_package, post_setupnode, uninstall_packages
+from woven.linux import uninstall_packages
from woven.linux import add_repositories
from woven.environment import server_state, set_server_state
@@ -42,23 +42,20 @@ def teardown_disable_root():
def test_lin_disable_root():
- local('rm -rf .woven')
+
#automate
env.DISABLE_ROOT = True
env.INTERACTIVE = False
env.HOST_PASSWORD = 'woven'
env.ROOT_PASSWORD = 'root'
#test
-
- disable_root()
with settings(host_string='woven@192.168.188.10:22',user='woven',password='woven'):
+ disable_root()
assert exists('/home/woven')
- #should skip the 2nd time
- disable_root()
- #cleanup - re-enable root
- teardown_disable_root()
+ #cleanup - re-enable root
+ #teardown_disable_root()
def test_lin_change_ssh_port():
@@ -109,12 +106,12 @@ def test_lin_port_is_open():
sudo ('cp -f /tmp/issue.bak /etc/issue')
-def test_lin_post_install_package():
- env.installed_packages = ['postgresql','somepackage']
- post_install_packages()
+#def test_lin_post_install_package():
+# env.installed_packages = ['postgresql','somepackage']
+# post_install_packages()
-def test_lin_post_setupnode():
- post_setupnode()
+#def test_lin_post_setupnode():
+# post_setupnode()
def test_lin_setup_ufw_rules():
#first define some rules that was in the settings
View
@@ -1,10 +1,6 @@
-from woven.virtualenv import post_deploy
from fabric.state import env
-def test_vir_post_deploy():
- env.INSTALLED_APPS = ['example_project.poll']
- post_deploy()

0 comments on commit 70f943e

Please sign in to comment.