Hello community, here is the log from the commit of package nodejs10 for openSUSE:Factory checked in at 2018-12-04 20:56:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs10 (Old) and /work/SRC/openSUSE:Factory/.nodejs10.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs10" Tue Dec 4 20:56:47 2018 rev:7 rq:653686 version:10.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs10/nodejs10.changes 2018-11-06 14:32:57.237164557 +0100 +++ /work/SRC/openSUSE:Factory/.nodejs10.new.19453/nodejs10.changes 2018-12-04 20:56:51.644684162 +0100 @@ -1,0 +2,5 @@ +Mon Nov 26 14:06:57 UTC 2018 - [email protected] + +- flaky_test_rerun.patch: Rerun failing tests in case of flakiness + +------------------------------------------------------------------- New: ---- flaky_test_rerun.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs10.spec ++++++ --- /var/tmp/diff_new_pack.5Glhxb/_old 2018-12-04 20:56:52.300683439 +0100 +++ /var/tmp/diff_new_pack.5Glhxb/_new 2018-12-04 20:56:52.304683434 +0100 @@ -61,7 +61,7 @@ %bcond_without intree_icu %endif -%if 0%{suse_version} >= 1500 +%if 0%{suse_version} >= 1550 %bcond_with intree_nghttp2 %else %bcond_without intree_nghttp2 @@ -133,6 +133,8 @@ Patch104: npm_search_paths.patch Patch105: skip_test_on_lowmem.patch +Patch120: flaky_test_rerun.patch + # Use versioned binaries and paths Patch200: versioned.patch @@ -319,6 +321,7 @@ %endif %patch104 -p1 %patch105 -p1 +%patch120 -p1 %patch200 -p1 # abnormalities from patching @@ -326,9 +329,9 @@ %build # normalize shebang -find -name \*.py -perm -1 -type f | xargs sed -i '1 s,^#!\s\?/usr/bin/env python$,#!/usr/bin/python,' -find deps/npm -type f | xargs sed -i '1 s,^#!\s\?/usr/bin/env node$,#!/usr/bin/node%{node_version_number},' -find deps/npm -type f | xargs sed -i '1 s,^#!\s\?/usr/bin/env \(bash\|sh\)\?$,#!/bin/bash,' +find -name \*.py -perm -1 -type f -exec sed -i '1 s,^#!\s\?/usr/bin/env python$,#!/usr/bin/python,' {} + +find deps/npm -type f -exec sed -i '1 s,^#!\s\?/usr/bin/env node$,#!/usr/bin/node%{node_version_number},' {} + +find deps/npm -type f -exec sed -i '1 s,^#!\s\?/usr/bin/env \(bash\|sh\)\?$,#!/bin/bash,' {} + . %{SOURCE20} # Make sure nothing gets included from bundled deps: @@ -428,7 +431,7 @@ # clean # hidden files and directories -find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number} -name ".*" -print0 | xargs -r0 -0 rm -rf -- +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number} -name ".*" -exec rm -Rf -- {} + # windows stuff find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number} -name "*.bat" -delete find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number} -name "*.cmd" -delete @@ -438,10 +441,9 @@ find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules -name "*.sh" -delete rm -rf %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules/node-gyp/src # remove examples/tests/benchmark stuff -find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules -name "example*" -print0 | xargs -0 rm -rf -- -find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/NODE_MODULES -name "test*" -print0 | xargs -0 rm -rf -- +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules -name "example*" -exec rm -Rf -- {} + find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules -name "*_test.*" -delete -find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules -type d -name "benchmark" -print0 | xargs -0 rm -rf -- +find %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/node_modules -type d -name "benchmark" -exec rm -Rf -- {} + # fix permissions chmod 0755 %{buildroot}%{_libdir}/node_modules/npm%{node_version_number}/bin/np*-cli.js ++++++ flaky_test_rerun.patch ++++++ diff --git a/tools/test.py b/tools/test.py index 67b8cb917e..51aaa3f8e0 100755 --- a/tools/test.py +++ b/tools/test.py @@ -512,11 +512,17 @@ class TestCase(object): def RunCommand(self, command, env): full_command = self.context.processor(command) - output = Execute(full_command, + reruns = 0 + while(reruns < 5): + print("FLAKY rerun: ", command) + reruns += 1 + output = Execute(full_command, self.context, self.context.GetTimeout(self.mode), env, disable_core_files = self.disable_core_files) + if output.exit_code == 0: + break; return TestOutput(self, full_command, output,
