[arch-commits] Commit in buildbot-www/trunk (PKGBUILD disable-broken-www-tests.patch)

[Chih-Hsuan Yen]

    Date: Sunday, September 15, 2019 @ 00:55:04
  Author: yan12125
Revision: 510602

upgpkg: buildbot-www 2.4.1-1

* Two previous patches are landed, but there are new test failures, so new patches
* Tests are now run by headless Chromium, so xvfb is no longer needed

Modified:
  buildbot-www/trunk/PKGBUILD
Deleted:
  buildbot-www/trunk/disable-broken-www-tests.patch

--------------------------------+
 PKGBUILD                       |   23 +++++++++--------------
 disable-broken-www-tests.patch |   18 ------------------
 2 files changed, 9 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-15 00:34:10 UTC (rev 510601)
+++ PKGBUILD	2019-09-15 00:55:04 UTC (rev 510602)
@@ -7,20 +7,18 @@
 pkgname=(python-buildbot-www python-buildbot-waterfall-view
          python-buildbot-console-view python-buildbot-grid-view
          python-buildbot-wsgi-dashboards python-buildbot-badges)
-pkgver=2.4.0
-pkgrel=2
+pkgver=2.4.1
+pkgrel=1
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
 makedepends=(git buildbot=$pkgver python-buildbot-pkg=$pkgver python-mock)
-checkdepends=(chromium xorg-server-xvfb)
+checkdepends=(chromium)
 source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig}
-        disable-broken-www-tests.patch
-        disable-broken-waterfall-tests.patch::https://github.com/buildbot/buildbot/commit/9ad94c5a3db7585a594fd51736cd9928efb2dd00.patch)
-sha256sums=('a865074e4874f20e11990ab5c65f87276b2bce9f7c29ca5b3b0da53ae51afbfd'
+        fix-re-tests.patch::https://github.com/buildbot/buildbot/pull/5013.patch)
+sha256sums=('6237a4c61a6208324ca246b328ba01660fa40a40cce20430963b33901cd80672'
             'SKIP'
-            '83f7ec59f2fa3fd1978337c5aedf73a988b150f4336ed75d6a55bb632185d6b3'
-            '9a302f8aebb5a0a8dbba3636d8bdc1e34295149c044975cd8bc8fc96545532f2')
+            'cb84d4ac5bc67f1cf8920263f358113be9748ddd4a4997f0149e5f380eedab38')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy <tardyp at gmail.com> (@tardyp on GitHub)
   'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas <povilas at radix.lt> (@p12tic on GitHub)
@@ -30,11 +28,8 @@
   cd "$srcdir"/buildbot-$pkgver
   # HACK: do not use virtualenv
   sed -i -e 's#frontend_deps:.*#frontend_deps:#' \
-         -e 's#frontend_tests:.*#frontend_tests:#' Makefile
-  # https://github.com/buildbot/buildbot/issues/4982
-  patch -Np1 -i ../disable-broken-www-tests.patch
-  # https://github.com/buildbot/buildbot/issues/4979
-  patch -Np1 -i ../disable-broken-waterfall-tests.patch
+         -e 's#frontend_tests_headless:.*#frontend_tests_headless:#' Makefile
+  patch -Np1 -i ../fix-re-tests.patch
 }
 
 build() {
@@ -53,7 +48,7 @@
 
 check() {
   cd "$srcdir"/buildbot-$pkgver
-  CHROME_BIN=/usr/bin/chromium xvfb-run make frontend_tests
+  CHROME_BIN=/usr/bin/chromium make frontend_tests_headless
 }
 
 package_python-buildbot-www() {

Deleted: disable-broken-www-tests.patch
===================================================================
--- disable-broken-www-tests.patch	2019-09-15 00:34:10 UTC (rev 510601)
+++ disable-broken-www-tests.patch	2019-09-15 00:55:04 UTC (rev 510602)
@@ -1,18 +0,0 @@
-diff --git a/www/base/src/app/common/directives/buildsummary/buildsummary.directive.spec.js b/www/base/src/app/common/directives/buildsummary/buildsummary.directive.spec.js
-index 2d01dd010..c74648c05 100644
---- a/www/base/src/app/common/directives/buildsummary/buildsummary.directive.spec.js
-+++ b/www/base/src/app/common/directives/buildsummary/buildsummary.directive.spec.js
-@@ -69,6 +69,7 @@ describe('buildsummary controller', function() {
-         buildsummary.toggleDetails();
-     });
- 
-+    /*
-     it('should provide correct getBuildRequestIDFromURL', function() {
-         const element = $compile("<buildsummary buildid='buildid'></buildsummary>")($scope);
-         $scope.$apply();
-@@ -100,4 +101,5 @@ describe('buildsummary controller', function() {
-         expect(buildsummary.isBuildURL(`${baseurl}#builders/sdf/builds/123`))
-         .toBe(false);
-     });
-+    */
- });