[SCM] ci-tooling packaging branch, master, updated. 92f4edb97d3ab78644471c762955d790094f925d

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit ccfc5561e0dffa7cfb1da667797d55279becd7b0
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Oct 6 12:10:11 2015 +0200

    drop stupid copy_data nonsense
    
    fixing this proper was a 2 line change
---
 test/test_ci_build_source.rb | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/test/test_ci_build_source.rb b/test/test_ci_build_source.rb
index e4ff1c3..12a67f5 100644
--- a/test/test_ci_build_source.rb
+++ b/test/test_ci_build_source.rb
@@ -19,6 +19,7 @@ class VCSBuilderTest < TestCase
       OS.instance_variable_set(:@hash, VERSION_ID: '15.04', ID: 'ubuntu')
     end
     alias_time
+    FileUtils.cp_r(Dir.glob("#{data}/*"), Dir.pwd)
   end
 
   def teardown
@@ -26,12 +27,6 @@ class VCSBuilderTest < TestCase
     unalias_time
   end
 
-  # Note: data is a method that resolves the fixture path from the
-  #   calling test_ method name. So we can not set up from setup.
-  def copy_data
-    FileUtils.cp_r(Dir.glob("#{data}/*"), Dir.pwd)
-  end
-
   def alias_time
     CI::BuildVersion.send(:alias_method, :__time_orig, :time)
     CI::BuildVersion.send(:define_method, :time) { REF_TIME }
@@ -58,7 +53,6 @@ class VCSBuilderTest < TestCase
   end
 
   def test_quilt
-    copy_data
     s = VcsSourceBuilder.new(release: @release)
     r = s.run
     assert_equal(:quilt, r.type)
@@ -67,7 +61,6 @@ class VCSBuilderTest < TestCase
   end
 
   def test_native
-    copy_data
     s = VcsSourceBuilder.new(release: @release)
     r = s.run
     assert_equal(:native, r.type)
@@ -76,7 +69,6 @@ class VCSBuilderTest < TestCase
   end
 
   def test_empty_install
-    copy_data
     s = VcsSourceBuilder.new(release: @release)
     r = s.run
     assert_equal(:native, r.type)
@@ -89,7 +81,6 @@ class VCSBuilderTest < TestCase
   end
 
   def test_build_fail
-    copy_data
     s = VcsSourceBuilder.new(release: @release)
     assert_raise RuntimeError do
       s.run
@@ -97,7 +88,6 @@ class VCSBuilderTest < TestCase
   end
 
   def test_symbols_keep
-    copy_data
     VcsSourceBuilder.new(release: KCI.latest_series).run
     Dir.chdir('build')
     tar = Dir.glob('*.tar.gz')
@@ -109,7 +99,6 @@ class VCSBuilderTest < TestCase
   end
 
   def test_symbols_strip
-    copy_data
     oldest_series = KCI.series(sort: :descending).keys.last
     VcsSourceBuilder.new(release: oldest_series).run
     Dir.chdir('build')

-- 
ci-tooling packaging