soda 1.1.15 → 1.1.16
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/Soda.rb +15 -6
- data/lib/sodainfo.rb +1 -1
- metadata +4 -4
data/lib/Soda.rb
CHANGED
@@ -2713,6 +2713,7 @@ JSCode
|
|
2713
2713
|
thread_timeout = (60 * 10) # 10 minutes #
|
2714
2714
|
time_check = nil
|
2715
2715
|
resultsdir = nil
|
2716
|
+
blocked = false
|
2716
2717
|
|
2717
2718
|
if (suitename != nil)
|
2718
2719
|
resultsdir = "#{@resultsDir}/#{suitename}"
|
@@ -2730,8 +2731,14 @@ JSCode
|
|
2730
2731
|
|
2731
2732
|
@rep = SodaReporter.new(file, @saveHtml, resultsdir, 0, nil, rerun);
|
2732
2733
|
SetGlobalVars()
|
2733
|
-
|
2734
|
-
|
2734
|
+
blocked = remBlockScript(file)
|
2735
|
+
|
2736
|
+
if (!blocked)
|
2737
|
+
script = getScript(file)
|
2738
|
+
else
|
2739
|
+
script = nil
|
2740
|
+
end
|
2741
|
+
|
2735
2742
|
if (script != nil)
|
2736
2743
|
@currentTestFile = file
|
2737
2744
|
thread_soda = Thread.new {
|
@@ -2778,9 +2785,11 @@ JSCode
|
|
2778
2785
|
@rep.IncTestPassedCount()
|
2779
2786
|
end
|
2780
2787
|
else
|
2781
|
-
|
2782
|
-
|
2783
|
-
|
2788
|
+
if (!blocked)
|
2789
|
+
msg = "Failed trying to run soda test: \"#{@currentTestFile}\"!\n"
|
2790
|
+
@rep.IncFailedTest()
|
2791
|
+
@rep.ReportFailure(msg)
|
2792
|
+
end
|
2784
2793
|
end
|
2785
2794
|
|
2786
2795
|
@rep.SodaPrintCurrentReport()
|
@@ -2890,7 +2899,7 @@ JSCode
|
|
2890
2899
|
end
|
2891
2900
|
|
2892
2901
|
tests.each do |test|
|
2893
|
-
next if (remBlockScript(test))
|
2902
|
+
# next if (remBlockScript(test))
|
2894
2903
|
test_order += 1
|
2895
2904
|
tmp_result = {}
|
2896
2905
|
tmp_result['result'] = run(test, false, true, suite_name)
|
data/lib/sodainfo.rb
CHANGED
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: soda
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 51
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 1.1.
|
9
|
+
- 16
|
10
|
+
version: 1.1.16
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Trampus Richmond
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2011-02-
|
18
|
+
date: 2011-02-25 00:00:00 -08:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|