Moved task skip logic from helper into taskfile.

aws · Jul 30, 2015 · 88694af · 88694af
1 parent 0e81558
commit 88694af
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git a/aws-sdk-core/features/integration-test-config.rb b/aws-sdk-core/features/integration-test-config.rb
@@ -1,8 +1,7 @@
 class IntegrationTestConfig
 
-  def initialize(path)
-    @path = path
-    @cfg = File.exists?(path) ? Aws::Json.load_file(path) : {}
+  def initialize(values)
+    @cfg = values
   end
 
   def value_at(*path)
@@ -22,13 +21,11 @@ def value_at(*path)
     end
 
     def load!
-      if ENV['AWS_INTEGRATION']
-        @cfg = new(path)
-      else
-        skip_integration_tests
-      end
+      @cfg = new(File.exists?(path) ? Aws::Json.load_file(path) : {})
     end
 
+    private
+
     def path
       File.expand_path(File.join([
         File.dirname(__FILE__),
@@ -38,19 +35,6 @@ def path
       ]))
     end
 
-    private
-
-    def skip_integration_tests
-      msg = <<-MSG
-
-*** skipping aws-sdk-resource integration tests ***
-  Export AWS_INTEGRATION=1 to enable integration tests
-
-      MSG
-      puts msg
-      exit(0)
-    end
-
   end
 end
 

diff --git a/aws-sdk-core/tasks/test.rake b/aws-sdk-core/tasks/test.rake
@@ -10,8 +10,17 @@ task 'test:unit' => 'test:unit:aws-sdk-core'
 
 desc 'aws-sdk-core integration tests'
 task 'test:integration:aws-sdk-core' do |t|
-  Dir.chdir('aws-sdk-core') do
-    exec("bundle exec cucumber -t ~@veryslow")
+  if ENV['AWS_INTEGRATION']
+    Dir.chdir('aws-sdk-core') do
+      exec("bundle exec cucumber -t ~@veryslow")
+    end
+  else
+    puts(<<-MSG)
+
+*** skipping aws-sdk-core integration tests ***
+  export AWS_INTEGRATION=1 to enable integration tests
+
+    MSG
   end
 end
 task 'test:integration' => 'test:integration:aws-sdk-core'
diff --git a/aws-sdk-resources/tasks/test.rake b/aws-sdk-resources/tasks/test.rake
@@ -16,8 +16,17 @@ task 'test:unit' => 'test:unit:resource-name-collisions'
 
 desc 'aws-sdk-resource integration tests'
 task 'test:integration:aws-sdk-resources' do |t|
-  Dir.chdir('aws-sdk-resources') do
-    exec("bundle exec cucumber -t ~@veryslow")
+  if ENV['AWS_INTEGRATION']
+    Dir.chdir('aws-sdk-resources') do
+      exec("bundle exec cucumber -t ~@veryslow")
+    end
+  else
+    puts(<<-MSG)
+
+*** skipping aws-sdk-core integration tests ***
+  export AWS_INTEGRATION=1 to enable integration tests
+
+    MSG
   end
 end
 task 'test:integration' => 'test:integration:aws-sdk-resources'