rutema 1.0.3 → 1.0.4

data/History.txt

@@ -1,10 +1,12 @@
+== 1.0.4 / 2008-11-7
+* Added functionality that allows ignoring the result of a step. The step is considered always successful
 == 1.0.3 / 2008-10-28
 * The name of the configuration file is added in the context information - can be used to group results together in cases where there are multiple configurations
 * Context is now stored as a Hash
 * EmailReporter now displays a footer as defined in it's configuration
 == 1.0.2 / 2008-10-23
 * Bugfix in ActiveRecordReporter: \000 sequences produce exceptions when inserting.
-* Output and error from commands is now more strctly sanitized.
+* Output and error from commands is now more strictly sanitized.
 == 1.0.1 / 2008-10-13
 * rutema_upgrader - Bug: update not performed - fixed
 == 1.0.0 / 2008-10-06

data/Manifest.txt

@@ -28,6 +28,7 @@ test/distro_test/specs/T002.spec
 test/distro_test/specs/T003.spec
 test/distro_test/specs/T004.spec
 test/distro_test/specs/T005.spec
+test/distro_test/specs/T006.spec
 test/distro_test/specs/include.scenario
 test/distro_test/specs/no_title.spec
 test/distro_test/specs/sample.spec

data/lib/rutema/specification.rb

@@ -180,6 +180,10 @@ module Rutema
       return "no command associated" unless @attributes[:cmd]
       return @attributes[:cmd].error
     end
+    def ignore?
+      return false unless @attributes[:ignore]
+      return @attributes[:ignore]
+    end
     def exec_time
       return 0 unless @attributes[:cmd]
       return @attributes[:cmd].exec_time
@@ -188,6 +192,9 @@ module Rutema
       return :warning unless @attributes[:cmd]
       return @attributes[:cmd].status
     end
+    def status= st
+      @attributes[:cmd].status=st if @attributes[:cmd]
+    end
     def run
       return not_executed unless @attributes[:cmd]
       return @attributes[:cmd].run

data/lib/rutema/system.rb

@@ -11,7 +11,7 @@ module Rutema
   module Version
     MAJOR=1
     MINOR=0
-    TINY=3
+    TINY=4
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
   #The Elements module provides the namespace for the various modules adding parser functionality
@@ -194,6 +194,7 @@ module Rutema
       xmldoc=REXML::Document.new( xmltxt )
       #any step element
       step=Rutema::TestStep.new()
+      step.ignore=false
       xmldoc.root.attributes.each do |attr,value|
         add_attribute(step,attr,value)
       end
@@ -473,8 +474,6 @@ module Rutema
     #Returns the result of the run as a Patir::CommandSequenceStatus
     def run name,scenario
       @logger.debug("Starting run for #{name} with #{scenario.inspect}")
-      @states[name]=Patir::CommandSequenceStatus.new(name,scenario.steps)
-      @states[name].sequence_id="#{@number_of_runs}s"
       #if setup /teardown is defined we need to execute them before and after
       if @setup
         @logger.info("Setup for #{name}")
@@ -485,11 +484,13 @@ module Rutema
           if @states["#{name}_setup"].success?
             @logger.info("Scenario for #{name}")
             @states[name]=run_scenario(name,scenario)
+            @states[name].sequence_id="#{@number_of_runs}"
           end
         end
       else
         @logger.info("Scenario for #{name}")
         @states[name]=run_scenario(name,scenario)
+        @states[name].sequence_id="#{@number_of_runs}"
       end
       if @teardown
         #always execute teardown
@@ -517,7 +518,7 @@ module Rutema
     def success?
       @success=true
       @states.each  do |k,v|
-        @success&=v.success?
+        @success&=(v.status!=:error)
       end
       return @success
     end
@@ -525,11 +526,12 @@ module Rutema
     def run_scenario name,scenario
       state=Patir::CommandSequenceStatus.new(name,scenario.steps)
       begin
-        if scenario.attended? && !self.attended?
+        attention_needed=scenario.attended?
+        if attention_needed && !self.attended?
           @logger.warn("Attended scenario cannot be run in unattended mode")
           state.status=:warning
         else
-          if scenario.attended?
+          if attention_needed
             state.strategy=:attended
           else
             state.strategy=:unattended
@@ -541,7 +543,7 @@ module Rutema
           else
             stps.each do |s| 
               state.step=run_step(s)
-              break if !state.success?
+              break if :error==state.status
             end
           end
         end
@@ -569,7 +571,14 @@ module Rutema
         msg<<"\n#{step.cmd.error}" unless step.cmd.error.empty?
       end
       if step.status==:error
-        @logger.error(msg) 
+        if step.ignore?
+          @logger.warn("Step failed but result is being ignored!")
+          @logger.warn(msg)
+          step.status=:success
+          
+        else
+          @logger.error(msg) 
+        end
       else
         @logger.info(msg)
       end

data/test/distro_test/config/database.rutema

@@ -9,5 +9,6 @@ configuration.tests=[
 "../specs/T002.spec",
 "../specs/T003.spec",
 "../specs/T004.spec",
-"../specs/T005.spec"
+"../specs/T005.spec",
+"../specs/T006.spec"
 ]

data/test/distro_test/config/full.rutema

@@ -5,7 +5,8 @@ configuration.tests=[
 "../specs/T002.spec",
 "../specs/T003.spec",
 "../specs/T004.spec",
-"../specs/T005.spec"
+"../specs/T005.spec",
+"../specs/T006.spec"
 ]
 configuration.tool={:name=>"test",:path=>".",:configuration=>{:key=>"value"}}
 configuration.path={:name=>"test",:path=>"."}

data/test/distro_test/config/jruby.rutema

@@ -5,5 +5,6 @@ configuration.tests=[
 "../specs/T002.spec",
 "../specs/T003.spec",
 "../specs/T004.spec",
-"../specs/T005.spec"
+"../specs/T005.spec",
+"../specs/T006.spec"
 ]

data/test/distro_test/config/minimal.rutema

@@ -4,5 +4,6 @@ configuration.tests=[
 "../specs/T002.spec",
 "../specs/T003.spec",
 "../specs/T004.spec",
-"../specs/T005.spec"
+"../specs/T005.spec",
+"../specs/T006.spec"
 ]

data/test/distro_test/specs/T006.spec

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<specification name="T006">
+<title>T006</title>
+<description>A command test</description>
+<scenario>
+	<command cmd="surely_it_will_fail" ignore="true"/>
+	<echo text="cool"/>
+</scenario>
+</specification>

data/test/test_system.rb

@@ -3,12 +3,13 @@ require 'test/unit'
 require 'ostruct'
 require 'rubygems'
 require 'patir/command'
+require 'mocha'
 
 #$DEBUG=true
 module TestRutema
   require 'rutema/system'
   class TestBaseXMlParser<Test::Unit::TestCase
-    SAMPLE_SPEC=<<EOT
+    SAMPLE_SPEC=<<-EOT
     <specification name="sample">
     <title>Title</title>
     <description>Description</description>
@@ -17,8 +18,8 @@ module TestRutema
     <another_step script="script"/>
     </scenario>
     </specification>
-EOT
-    INCLUDE_SPEC=<<EOT
+    EOT
+    INCLUDE_SPEC=<<-EOT
     <specification name="include">
     <title>Title</title>
     <description>Description</description>
@@ -27,8 +28,8 @@ EOT
     <include_scenario file="#{File.expand_path(File.dirname(__FILE__))}/distro_test/specs/include.scenario"/>
     </scenario>
     </specification>
-EOT
-    BAD_INCLUDE_SPEC=<<EOT
+    EOT
+    BAD_INCLUDE_SPEC=<<-EOT
     <specification name="bad_include">
     <title>Title</title>
     <description>Description</description>
@@ -36,8 +37,8 @@ EOT
     <include_scenario file=unknown.scenario"/>
     </scenario>
     </specification>
-EOT
-    MISSING_INCLUDE_SPEC=<<EOT
+    EOT
+    MISSING_INCLUDE_SPEC=<<-EOT
     <specification name="bad_include">
     <title>Title</title>
     <description>Description</description>
@@ -45,8 +46,8 @@ EOT
     <include_scenario/>
     </scenario>
     </specification>
-EOT
-    
+    EOT
+
     def test_parse_specification
       parser=Rutema::BaseXMLParser.new({})
       specification=parser.parse_specification(SAMPLE_SPEC)
@@ -62,7 +63,7 @@ EOT
       assert_raise(Rutema::ParserError) { parser.parse_specification("") }
       assert_raise(Rutema::ParserError) { parser.parse_specification("missing.spec") }
     end
-    
+
     def test_include
       parser=Rutema::BaseXMLParser.new({})
       specification=parser.parse_specification(INCLUDE_SPEC)
@@ -71,11 +72,11 @@ EOT
       assert_raise(Rutema::ParserError) {  parser.parse_specification(BAD_INCLUDE_SPEC) }
       assert_raise(Rutema::ParserError) {  parser.parse_specification(MISSING_INCLUDE_SPEC) }
     end
-    
+
   end
-  
+
   class TestExtensibleXMlParser<Test::Unit::TestCase
-    SAMPLE_SPEC=<<EOT
+    SAMPLE_SPEC=<<-EOT
     <specification name="sample">
     <title>Title</title>
     <description>Description</description>
@@ -84,7 +85,7 @@ EOT
     <another_step script="script"/>
     </scenario>
     </specification>
-EOT
+    EOT
     def test_parse_specification
       parser=Rutema::ExtensibleXMLParser.new({})
       assert_nil(parser.configuration)
@@ -92,7 +93,7 @@ EOT
     end
   end
   class TestMinimalXMlParser<Test::Unit::TestCase
-    SAMPLE_SPEC=<<EOT
+    SAMPLE_SPEC=<<-EOT
     <specification name="sample">
     <title>Title</title>
     <description>Description</description>
@@ -101,7 +102,7 @@ EOT
     <command cmd="l"/>
     </scenario>
     </specification>
-EOT
+    EOT
     def test_parse_specification
       parser=Rutema::MinimalXMLParser.new({})
       assert_nothing_raised() { @specification=parser.parse_specification(SAMPLE_SPEC) }
@@ -168,7 +169,7 @@ EOT
       state2=runner.run("test2",scenario)
       assert_equal(2, runner.states.size)
     end
-    
+
     def test_run_exceptions
       runner=Rutema::Runner.new
       scenario=Rutema::TestScenario.new
@@ -187,6 +188,26 @@ EOT
       runner.reset
       assert(runner.states.empty?)
     end
+
+    def test_ignore
+      step=OpenStruct.new("status"=>:not_executed)
+      step.stubs(:number).returns(1)
+      step.stubs(:name).returns("mock")
+      step.stubs(:step_type).returns("mock")
+      step.stubs(:output).returns("mock")
+      step.stubs(:error).returns("")
+      step.stubs(:strategy).returns(:attended)
+      step.stubs(:exec_time).returns(12)
+      step.stubs(:has_cmd?).returns(false)
+      step.expects(:ignore?).returns(true)
+      step.expects(:status).times(5).returns(:not_executed).then.returns(:not_executed).then.returns(:error).then.returns(:warning).then.returns(:warning)
+      scenario=Rutema::TestScenario.new
+      scenario.expects(:attended?).returns(false)
+      scenario.stubs(:steps).returns([step])
+      runner=Rutema::Runner.new
+      runner.run("ignore",scenario)
+      assert(runner.success?,"run is not a success")
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rutema
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-05 00:00:00 +01:00
+date: 2008-11-07 00:00:00 +01:00
 default_executable: rutemax
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,7 @@ files:
 - test/distro_test/specs/T003.spec
 - test/distro_test/specs/T004.spec
 - test/distro_test/specs/T005.spec
+- test/distro_test/specs/T006.spec
 - test/distro_test/specs/include.scenario
 - test/distro_test/specs/no_title.spec
 - test/distro_test/specs/sample.spec