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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit cb2db2b37a10f4ccb9645ecb371e484009845881
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Mar 23 12:47:08 2015 +0100

    force full runtime setting of LSB vars
---
 test/test_ci_build_version.rb        | 7 ++-----
 test/test_qml_dependency_verifier.rb | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/test/test_ci_build_version.rb b/test/test_ci_build_version.rb
index d25447e..1286309 100644
--- a/test/test_ci_build_version.rb
+++ b/test/test_ci_build_version.rb
@@ -3,11 +3,6 @@ require 'test/unit'
 require_relative '../lib/ci/build_version'
 require_relative '../lib/debian/changelog'
 
-# Reopen singleton modules and force useful data
-module LSB
-  @hash = { DISTRIB_RELEASE: '15.04' }
-end
-
 # Test ci/build_version
 class CIBuildVersionTest < Test::Unit::TestCase
   def setup
@@ -16,10 +11,12 @@ class CIBuildVersionTest < Test::Unit::TestCase
     @datadir = File.join(script_base_path, 'data', script_name)
     @previous_pwd = Dir.pwd
     Dir.chdir(@datadir)
+    LSB.instance_variable_set(:@hash, DISTRIB_RELEASE: '15.04')
   end
 
   def teardown
     Dir.chdir(@previous_pwd)
+    LSB.reset
   end
 
   def data(path = nil)
diff --git a/test/test_qml_dependency_verifier.rb b/test/test_qml_dependency_verifier.rb
index b589af1..ac71c99 100644
--- a/test/test_qml_dependency_verifier.rb
+++ b/test/test_qml_dependency_verifier.rb
@@ -6,11 +6,6 @@ require_relative '../lib/qml_dependency_verifier'
 require_relative 'lib/assert_backtick'
 require_relative 'lib/assert_system'
 
-# Reopen singleton modules and force useful data
-module LSB
-  @hash = { DISTRIB_CODENAME: 'vivid' }
-end
-
 # Test qml dep verifier
 class QMLDependencyVerifierTest < Test::Unit::TestCase
   prepend AssertBacktick
@@ -34,11 +29,13 @@ class QMLDependencyVerifierTest < Test::Unit::TestCase
 
     @previous_pwd = Dir.pwd
     Dir.chdir(@datadir)
+    LSB.instance_variable_set(:@hash, DISTRIB_CODENAME: 'vivid')
   end
 
   def teardown
     VCR.eject_cassette(File.basename(__FILE__, '.rb'))
     Dir.chdir(@previous_pwd)
+    LSB.reset
   end
 
   def data(path = nil)

-- 
ci-tooling packaging