2 slaves down system test ok

Incubaid · May 10, 2012 · bde40b1 · bde40b1
1 parent f86ec46
commit bde40b1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/jenkins/system_tests_slow_left/015_run_tests.sh b/jenkins/system_tests_slow_left/015_run_tests.sh
@@ -5,4 +5,4 @@ export PATH=$BUILD_ENV/bin:$PATH
 export LD_LIBRARY_PATH=$BUILD_ENV/lib
 export LIBRARY_PATH=$BUILD_ENV/lib
 
-python test_it.py -s --with-xunit --xunit-file=foobar.xml test.server.right.system_tests_long_right
+python test_it.py -s --with-xunit --xunit-file=foobar.xml test.server.right.system_tests_long_left
diff --git a/pylabs/test/server/quick/system_tests_basic.py b/pylabs/test/server/quick/system_tests_basic.py
@@ -80,12 +80,6 @@ def test_large_value ():
 
 
 
-
-
-
-
-
-
 @C.with_custom_setup( C.default_setup, C.basic_teardown )
 def test_range_entries ():
     C.range_entries_scenario( 1000 )

diff --git a/pylabs/test/server/right/system_tests_long_right.py b/pylabs/test/server/right/system_tests_long_right.py
@@ -29,7 +29,7 @@
 import time
 import subprocess
 from nose.tools import *
-
+CONFIG = C.CONFIG
 
 @C.with_custom_setup( C.default_setup, C.basic_teardown )
 def test_single_client_100000_sets():
@@ -378,7 +378,7 @@ def test_3_nodes_2_slaves_down ():
     cli = C.get_client()
     master_id = cli.whoMaster()
 
-    slaves = filter( lambda n: n != master_id, C.node_names )
+    slaves = filter( lambda n: n != master_id, CONFIG.node_names )
     for slave in slaves:
         C.stopOne( slave )
 
@@ -478,14 +478,6 @@ def test_log_rotation():
         time.sleep(0.2)
         C.assert_running_nodes(1)
 
-@C.with_custom_setup(C.setup_1_node, C.basic_teardown)
-def test_log_rotation():
-    node = C.node_names[0]
-    for i in range(100):
-        C.rotate_log(node, 1, False)
-        time.sleep(0.2)
-        C.assert_running_nodes(1)
-
 @C.with_custom_setup(C.setup_3_nodes_mini, C.basic_teardown)
 def test_243():
     node_names = C.node_names