datadog-sdk-testing 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f62295171cc9a912a49460749717952f75d20ee
-  data.tar.gz: bc6dd1dfcc1abc018b854b6b7f18922e2dc7b171
+  metadata.gz: 8abfa3c4a71a45a7f7be6ef19b3ac17de10812ad
+  data.tar.gz: 952c49ece71ff1f1fa96cdaa652c3f52fbc8c393
 SHA512:
-  metadata.gz: 48b2873ee19bc7daa499f72c9611ccff55a83877607e14f8e8dd43940ffea65a0b7bb263fb8b26a2739db6abf965476f42eeb408b00d270a78beb2e5ec0f5b10
-  data.tar.gz: 7acc3816ac27414d8d26fcedceb8cdecec1a20489120e2699db09adbf5ca81b7aee7b182d81d143bcd553232ae0cebcf75e9329369e11d935fe699bf16c413fe
+  metadata.gz: 46c82f0a53287b96e638eb1d57ff914c8e28c0a5a40cbdf0a2f01f773130dfc54bd142e73f0f6ffdab134cd874ab413d6d919c8e5cd659024bb2c655045b711f
+  data.tar.gz: ca21e14b396d519e58d771ebc6ebc82ab1fb5f11b28d0332a408f4976c0d99b0867810893b9df034115b34b63e33d5265d58cc6304c0e4ab366d6bb5dc97f3ad

data/lib/config/ci/skeleton.rake

@@ -24,33 +24,29 @@ namespace :ci do
 
     task before_script: ['ci:common:before_script']
 
-    task :script, [:mocked] => ['ci:common:script'] do |_, attr|
-      mocked = attr[:mocked] || false
+    task script: ['ci:common:script'] do |_, attr|
       this_provides = [
         'skeleton'
       ]
-      Rake::Task['ci:common:run_tests'].invoke(this_provides, mocked)
+      Rake::Task['ci:common:run_tests'].invoke(this_provides)
     end
 
     task before_cache: ['ci:common:before_cache']
 
     task cleanup: ['ci:common:cleanup']
     # sample cleanup task
-    # task cleanup: ['ci:common:cleanup'] do 
+    # task cleanup: ['ci:common:cleanup'] do
     #   sh %(docker stop skeleton)
     #   sh %(docker rm skeleton)
     # end
 
-    task :execute, :mocked do |_, attr|
-      mocked = attr[:mocked] || false
+    task :execute do
       exception = nil
       begin
-        if not mocked
-          %w(before_install install before_script).each do |u|
-            Rake::Task["#{flavor.scope.path}:#{u}"].invoke
-          end
+        %w(before_install install before_script).each do |u|
+          Rake::Task["#{flavor.scope.path}:#{u}"].invoke
         end
-        Rake::Task["#{flavor.scope.path}:script"].invoke(mocked)
+        Rake::Task["#{flavor.scope.path}:script"].invoke
         Rake::Task["#{flavor.scope.path}:before_cache"].invoke
       rescue => e
         exception = e

data/lib/config/test_skeleton.py

@@ -16,7 +16,7 @@ instance = {
 
 # NOTE: Feel free to declare multiple test classes if needed
 
-@attr(requires='skeleton', mock=False)  # set mock to True if appropriate
+@attr(requires='skeleton')
 class TestSkeleton(AgentCheckTest):
     """Basic Test for skeleton integration."""
     CHECK_NAME = 'skeleton'

data/lib/tasks/ci/common.rb

@@ -242,18 +242,16 @@ namespace :ci do
       t.reenable
     end
 
-    task :run_tests, [:flavor, :mocked] do |t, attr|
+    task :run_tests, [:flavor] do |t, attr|
       flavors = attr[:flavor]
       sdkhome = ENV['SDK_HOME'] || Dir.pwd
-      mocked = attr[:mocked] || false
       filter = ENV['NOSE_FILTER'] || '1'
       nose_command = in_venv ? 'venv/bin/nosetests' : 'nosetests'
 
-      mock_filter = mocked ? "mock" : "not mock"
       nose = if flavors.include?('default')
-               "(not requires) and #{filter} and #{mock_filter}"
+               "(not requires) and #{filter}"
              else
-               "(requires in ['#{flavors.join("','")}']) and #{filter} and #{mock_filter}"
+               "(requires in ['#{flavors.join("','")}']) and #{filter}"
              end
 
       tests_directory, = integration_tests(sdkhome)

data/lib/tasks/sdk.rake

@@ -97,22 +97,15 @@ end
 
 namespace :ci do
   desc 'Run integration tests'
-  task :run, [:flavor, :mocked] do |_, args|
+  task :run, [:flavor] do |_, args|
     check_env
     puts 'Assuming you are running these tests locally' unless ENV['TRAVIS']
     flavor = args[:flavor] || ENV['TRAVIS_FLAVOR'] || 'default'
-    mocked = args[:mocked] || false
     flavors = flavor.split(',')
     flavors.each do |f|
-      Rake::Task["ci:#{f}:execute"].invoke(mocked)
+      Rake::Task["ci:#{f}:execute"].invoke
     end
   end
-
-  desc 'Run mock tests'
-  task :run_mocks, [:flavor] do |_, args|
-    check_env
-    Rake::Task["ci:run"].invoke(args[:flavor], true)
-  end
 end
 
 task default: ['lint', 'ci:run']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-sdk-testing
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Jaime Fullaondo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies: []
 description: Datadog Integration SDK testing/scaffolding gem
 email: jaime.fullaondo@datadoghq.com