buildbot: 0.9.5 -> 0.9.6

This commit is contained in:
Lancelot SIX 2017-05-03 22:31:17 +02:00
parent ff472837ea
commit d41a0832b6
No known key found for this signature in database
GPG Key ID: 02E1542BA66FB047
2 changed files with 23 additions and 2 deletions

View File

@ -13,11 +13,11 @@ let
package = pythonPackages.buildPythonApplication (rec {
name = "${pname}-${version}";
pname = "buildbot";
version = "0.9.5";
version = "0.9.6";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "11r553nmh87a9pm58wycimapk2pw9hnlc7hffn97xwbqprd8qh66";
sha256 = "0d6ys1wjwsv4jg4bja1cqhy279hhrl1c9kwyx126srf45slcvg1w";
};
buildInputs = with pythonPackages; [
@ -69,6 +69,12 @@ let
];
patches = [
# This patch disables the test that tries to reat /etc/os-release which
# is not accessible in sandboxed builds.
./skip_test_linux_distro.patch
];
postPatch = ''
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
@ -79,6 +85,10 @@ let
rm -fv buildbot/test/unit/test_interpolate_secrets.py
rm -fv buildbot/test/unit/test_secret_in_file.py
rm -fv buildbot/test/unit/test_secret_in_vault.py
# Remove this line after next update. See
# https://github.com/buildbot/buildbot/commit/e7fc8c8eba903c2aa6d7e6393499e5b9bffc2334
rm -fv buildbot/test/unit/test_mq_wamp.py
'';
passthru = { inherit withPlugins; };

View File

@ -0,0 +1,11 @@
diff -Nur buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py
--- buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-04-19 16:57:02.000000000 +0200
+++ buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-05-04 12:22:54.575762551 +0200
@@ -147,6 +147,7 @@
_sendBuildbotNetUsageData({'foo': 'bar'})
def test_linux_distro(self):
+ raise SkipTest("NixOS sandboxed builds hides /etc/os-release")
system = platform.system()
if system != "Linux":
raise SkipTest("test is only for linux")