updated our cucumber infrastructure for latest ep-engine changes

Change-Id: Ief523cd621c4bf0fadf5ea47621aa4cc64393f1b Reviewed-on: http://review.northscale.com:8080/360 Reviewed-by: Steve Yen <steve.yen@gmail.com> Tested-by: Steve Yen <steve.yen@gmail.com>
couchbase · Jun 9, 2010 · fb4ae2c · fb4ae2c
1 parent b74f115
commit fb4ae2c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/features/support/util.rb b/features/support/util.rb
@@ -45,7 +45,7 @@ def poll_for_condition(timeout = 10, fail_unless_ok = true)
       if fail_unless_ok
         # puts "Timeout!!"
         # STDIN.gets
-        raise "Timeout hit while waiting for condition"
+        raise "Timeout hit (#{timeout}) while waiting for condition"
       end
     end
     ok
@@ -131,7 +131,7 @@ def node_resurrect(node_label)
   # ------------------------------------------------------
 
   def start_single_node(i)
-    ports = [$base_cache_port + i*2, $base_cache_port + i*2 + 1, $base_api_port + i]
+    ports = [$base_cache_port + i*2, $base_api_port + i]
 
     wait_down_ports(ports, -1)
 
@@ -173,7 +173,7 @@ def start!
         @cluster_ptys << rv
       end
 
-      wait_up_ports(ports_to_wait)
+      wait_up_ports(ports_to_wait, 30)
     rescue Exception
       stop!
       raise
@@ -183,7 +183,7 @@ def start!
     sleep 5
   end
 
-  def wait_up_ports(ports_to_wait, timeout = 10)
+  def wait_up_ports(ports_to_wait, timeout = 20)
     poll_for_condition(timeout) do
       tmp = ports_to_wait
       ports_to_wait = []
@@ -267,7 +267,7 @@ def do_join(joiner, joinee)
 def cluster_join(joiner, joinee)
   do_join(joiner, joinee)
 
-  poll_for_condition(10) do
+  poll_for_condition(30) do
     (node_info(joinee, joiner) rescue false) && (node_info(joiner, joinee) rescue false)
   end
 
@@ -306,7 +306,7 @@ def cluster_eject(ejectee, ejecter = nil)
 
   sleep 5
 
-  poll_for_condition(7, false) do
+  poll_for_condition(20, false) do
     ClusterConfig.active_cluster.node_labels.all? do |label|
       label == ejectee || !((node_info(label, ejectee) rescue true) ||
                             (node_info(ejectee, label) rescue true))

diff --git a/test/gen_cluster_scripts.rb b/test/gen_cluster_scripts.rb
@@ -40,11 +40,12 @@
         ["-p", "#{(x * 2) + base_cache_port}",
          "-X", "./priv/engines/stdin_term_handler.so",
          "-E", "./priv/engines/bucket_engine.so",
-         "-e", "admin=_admin;engine=./priv/engines/default_engine.so;default_bucket_name=default;auto_create=false",
+         "-e", "admin=_admin;engine=./priv/engines/ep.so;default_bucket_name=default;auto_create=false"
-         "-B", "auto"],
+        ],
         [{env, [{"MEMCACHED_TOP_KEYS", "100"},
-                {"ISASL_PWFILE", "./priv/isasl.pw"},
+                {"ISASL_PWFILE", "./priv/isasl.pw"}, % Also isasl path above.
-                {"ISASL_DB_CHECK_TIME", "1"}]},
+                {"ISASL_DB_CHECK_TIME", "1"}
+               ]},
          use_stdio,
          stderr_to_stdout,
          stream]
@@ -53,6 +54,12 @@
 end
 
 pools = <<END
+{memcached, [{'_ver', {0, 0, 0}},
+        {port, #{base_cache_port}},
+        {admin_user, "_admin"},
+        {admin_pass, "_admin"},
+        {buckets, ["default"]}]}.
+
 {pools, [
   {'_ver', {0, 0, 0}},
   {"default", [