[SCM] ci-tooling packaging branch, master, updated. 2f2549ac048dd35ee00e6be512ad5b06c0d59b40

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=2f2549a

The following commit has been merged in the master branch:
commit 2f2549ac048dd35ee00e6be512ad5b06c0d59b40
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Oct 16 11:01:41 2015 +0200

    bloody vcr
    
    enable it as I can't seem to make it not fuck the test pass when run with
    multiple tests that use vcr and others that dont need to
---
 test/test_kci_orig_sourcer.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/test/test_kci_orig_sourcer.rb b/test/test_kci_orig_sourcer.rb
index e131ed8..e4b3709 100644
--- a/test/test_kci_orig_sourcer.rb
+++ b/test/test_kci_orig_sourcer.rb
@@ -5,10 +5,6 @@ require_relative '../kci/orig_sourcer.rb'
 
 module KCI
   class OrigSourcerTestCase < TestCase
-    def setup
-      VCR.turn_off!(ignore_cassettes: false)
-    end
-
     def test_tarball # also tests watch
       FileUtils.cp_r(Dir.glob("#{data}/*"), Dir.pwd)
       Test.http_serve(data('http')) do
@@ -37,10 +33,12 @@ module KCI
       File.write('source/url',
                  "http://localhost:9473/dragon-15.08.1.tar.xz
")
       Test.http_serve(data) do
-        tarball = KCI::OrigSourcer.tarball
-        assert_not_equal(nil, tarball)
-        assert_equal('dragon_15.08.1.orig.tar.xz',
-                     File.basename(tarball.path))
+        VCR.use_cassette(__method__, erb: true) do
+          tarball = KCI::OrigSourcer.tarball
+          assert_not_equal(nil, tarball)
+          assert_equal('dragon_15.08.1.orig.tar.xz',
+                       File.basename(tarball.path))
+        end
       end
     end
   end

-- 
ci-tooling packaging