Merge pull request #87 from clowder/fix_specs_passing_by_accident

Removed memoization [Foreman::Utils.parse_concurrency]
ddollar · Oct 19, 2011 · c6a410b · c6a410b
2 parents ada41ce + 02c8d2c
commit c6a410b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/foreman/utils.rb b/lib/foreman/utils.rb
@@ -3,7 +3,7 @@
 class Foreman::Utils
 
   def self.parse_concurrency(concurrency)
-    @concurrency ||= begin
+    begin
       pairs = concurrency.to_s.gsub(/\s/, "").split(",")
       pairs.inject(Hash.new(1)) do |hash, pair|
         process, amount = pair.split("=")

diff --git a/spec/foreman/export/bluepill_spec.rb b/spec/foreman/export/bluepill_spec.rb
@@ -12,7 +12,7 @@
   before(:each) { stub(bluepill).say }
 
   it "exports to the filesystem" do
-    bluepill.export("/tmp/init")
+    bluepill.export("/tmp/init", :concurrency => "alpha=2")
 
     File.read("/tmp/init/app.pill").should == example_export_file("bluepill/app.pill")
   end

diff --git a/spec/foreman/export/upstart_spec.rb b/spec/foreman/export/upstart_spec.rb
@@ -12,7 +12,7 @@
   before(:each) { stub(upstart).say }
 
   it "exports to the filesystem" do
-    upstart.export("/tmp/init")
+    upstart.export("/tmp/init", :concurrency => "alpha=2")
 
     File.read("/tmp/init/app.conf").should         == example_export_file("upstart/app.conf")
     File.read("/tmp/init/app-alpha.conf").should   == example_export_file("upstart/app-alpha.conf")