conf_option.feature in trema-0.9.0

- old
+ new

@@ -1,11 +1,16 @@
 Feature: -c (--conf) option
 
   -c (--conf) option specifies emulated network configuration
 
   Background:
-    Given a file named "hello.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "hello.rb" with:
       """ruby
       class Hello < Trema::Controller
         def switch_ready(dpid)
           logger.info format('Hello %s!', dpid.to_hex)
         end
@@ -17,16 +22,16 @@
       """
 
   @sudo
   Scenario: -c option
     When I successfully run `trema run hello.rb -c trema.conf -d`
-    And I run `sleep 5`
+    And sleep 5
     Then the file "Hello.log" should contain "Hello 0xabc!"
 
   @sudo
   Scenario: --conf option
     When I successfully run `trema run hello.rb --conf trema.conf -d`
-    And I run `sleep 5`
+    And sleep 5
     Then the file "Hello.log" should contain "Hello 0xabc!"
 
   @sudo
   Scenario: "No such file" error
     When I run `trema run hello.rb -c nosuchfile -d`