atp 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ade09fa87d4ff3f63b38bb3ba4dca6524d7e5dd
-  data.tar.gz: 05379db576550d3b423c28bb084ab170a6f96f9b
+  metadata.gz: cc41fbbf375fb2096a5a6448cd8cbb6a17c1acec
+  data.tar.gz: ce6ae9e83db3fb17a0e65054aa85aecaef755b47
 SHA512:
-  metadata.gz: 56c43e8a9054f69982ea469dac331dffc32dce19861dbb5a8ecff0508311e800e32cda904d15944010f5a078dd437b1dc2cd0b62397fcd2b53450cf0839500ab
-  data.tar.gz: 6b14b723b4efdb50a951711780158738228cafda516cdfd9efa10739633a7de45359a17c22777c75202aae7e59ca74e7175b7d8251ad909cd933a8198790c38d
+  metadata.gz: 920d52764ac0272df6f068412252587343194f04f3931dcdaf73c1905b78ea4d7129e27cfa4560c5017cad4a2ee5274fb021c27398d0d628eb4871a54bdfebc8
+  data.tar.gz: 11f5b29de3140272e07a2f8bf98c548f009f980f895666664b43fcb98f9775ecfb5e81807167810d5cb2bf530fee8a67688b95c31c32310cee3bc1d3aff6f859

data/config/version.rb

@@ -1,7 +1,7 @@
 module ATP
   MAJOR = 0
   MINOR = 4
-  BUGFIX = 1
+  BUGFIX = 2
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/atp/flow.rb

@@ -112,7 +112,7 @@ module ATP
       t = apply_open_conditions(options) do |options|
         conditions = options.delete(:conditions)
         options[:return] = true
-        builder.cz(cz_setup, test(instance, options), conditions: conditions)
+        builder.cz(cz_setup, test(instance, options.merge(dont_apply_conditions: true)), conditions: conditions)
       end
       append(t)
     end
@@ -263,8 +263,10 @@ module ATP
       builder.new_context
       t = yield(options)
       unless options[:context] == :current
-        open_conditions.each do |conditions|
-          t = builder.apply_conditions(t, conditions)
+        unless options[:dont_apply_conditions]
+          open_conditions.each do |conditions|
+            t = builder.apply_conditions(t, conditions)
+          end
         end
       end
       t

data/lib/atp/formatters/basic.rb

@@ -10,7 +10,19 @@ module ATP
       end
 
       def on_test(node)
-        @output += node.find(:name).value
+        if node.find(:name)
+          @output += node.find(:name).value
+        else
+          @output += node.find(:object).value['Test']
+        end
+        @output += ' F' if node.find(:failed)
+        @output += "\n"
+      end
+
+      def on_set_result(node)
+        @output += node.to_a[0].upcase
+        @output += " #{node.find(:bin).value}" if node.find(:bin)
+        @output += " #{node.find(:softbin).value}" if node.find(:softbin)
         @output += "\n"
       end
     end

data/lib/atp/runner.rb

@@ -79,21 +79,23 @@ module ATP
         if failed_test_ids.include?(id)
           node = node.add(n0(:failed))
           failed = true
+          if n_on_fail = node.find(:on_fail)
+            node = node.remove(n_on_fail)
+          end
         end
       end
-      # If there is a group on_fail, then remove any test specific one as that
-      # will be overridden
-      if @groups_on_fail.last
-        if n_on_fail = node.find(:on_fail)
-          node = node.remove(n_on_fail)
-        end
-      end
-      if @groups_on_pass.last
+      unless failed
         if n_on_pass = node.find(:on_pass)
           node = node.remove(n_on_pass)
         end
       end
-      container << node unless completed?
+
+      unless completed?
+        container << node
+        process_all(n_on_fail) if n_on_fail
+        process_all(n_on_pass) if n_on_pass
+      end
+
       if failed
         # Give indication to the parent group that at least one test within it failed
         if @groups.last
@@ -143,7 +145,7 @@ module ATP
         @groups_on_fail.pop
         @groups_on_pass.pop
       end
-      container << node.updated(nil, c + [on_fail, on_pass])
+      container << node.updated(nil, c)
     end
 
     def on_set_result(node)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atp
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -121,4 +121,3 @@ signing_key:
 specification_version: 4
 summary: An abstract test program model for Origen
 test_files: []
-has_rdoc: