[SCM] ci-tooling packaging branch, master, updated. 4d11859824b6e6bbad29ef0c7dca252970e44cb1
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Mon Oct 5 12:41:10 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=4d11859
The following commit has been merged in the master branch:
commit 4d11859824b6e6bbad29ef0c7dca252970e44cb1
Author: Harald Sitter <sitter at kde.org>
Date: Mon Oct 5 14:41:05 2015 +0200
fake os
---
test/test_kci_builder.rb | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/test/test_kci_builder.rb b/test/test_kci_builder.rb
index 4b09163..b1130a7 100644
--- a/test/test_kci_builder.rb
+++ b/test/test_kci_builder.rb
@@ -12,11 +12,21 @@ class KCIBuilderTest < TestCase
FileUtils.cp_r(Dir.glob("#{data}/*"), Dir.pwd, verbose: true)
rescue RuntimeError
end
+
+ # FIXME: code copy from test_ci_build_source
+ if OS::ID == 'debian'
+ @release = 'sid'
+ OS.instance_variable_set(:@hash, VERSION_ID: '9', ID: 'debian')
+ elsif OS::ID == 'ubuntu'
+ @release = 'vivid'
+ OS.instance_variable_set(:@hash, VERSION_ID: '15.04', ID: 'ubuntu')
+ end
alias_time
end
def teardown
unalias_time
+ OS.reset
KCIBuilder.testing = false
end
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list