trema.killall.feature in trema-0.2.6

- old
+ new
@@ -1,30 +1,30 @@
-Feature: kill all trema processes with `trema killall' command
+Feature: trema killall command
 
-  As a Trema user
-  I want to kill all trema processes with `trema killall' command
-  So that I can close trema sessions cleanly
+  In order to cleanup the previous trema session
+  As a developer using Trema
+  I want to execute "trema killall" command
 
-
+  @slow_process
   Scenario: trema killall
-    Given I try trema run "./objects/examples/dumper/dumper" with following configuration (backgrounded):
+    Given a file named "switch_monitor.conf" with:
       """
-      vswitch { datapath_id "0xabc" }
-      """
-      And wait until "dumper" is up
-    When I try to run "./trema killall"
-      And *** sleep 1 ***
-    Then switch_manager is terminated
-      And switch is terminated
-      And ovs-openflowd is terminated
-      And dumper is terminated
+      vswitch { datapath_id 0x1 }
+      vswitch { datapath_id 0x2 }
+      vswitch { datapath_id 0x3 }
 
+      vhost "host1"
+      vhost "host2"
+      vhost "host3"
 
-  Scenario: trema help killall
-    When I try to run "./trema help killall"
-    Then the output should be:
+      link "0x1", "host1"
+      link "0x2", "host2"
+      link "0x3", "host3"
       """
-      Usage: trema killall [OPTIONS ...]
-          -h, --help
-          -v, --verbose
-
-      """
+     And I successfully run `trema run ../../objects/examples/switch_monitor/switch_monitor -c switch_monitor.conf -d`
+     And wait until "switch_monitor" is up
+    When I run `trema killall`
+    Then switch_manager is terminated
+     And switch is terminated
+     And phost is terminated
+     And ovs-openflowd is terminated
+     And switch_monitor is terminated