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

[Chih-Hsuan Yen]

    Date: Tuesday, August 20, 2019 @ 13:38:09
  Author: yan12125
Revision: 500297

upgpkg: buildbot-www 2.4.0-2

Add check()

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-20 13:36:19 UTC (rev 500296)
+++ PKGBUILD	2019-08-20 13:38:09 UTC (rev 500297)
@@ -8,14 +8,19 @@
          python-buildbot-console-view python-buildbot-grid-view
          python-buildbot-wsgi-dashboards python-buildbot-badges)
 pkgver=2.4.0
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
 makedepends=(git buildbot=$pkgver python-buildbot-pkg=$pkgver python-mock)
-source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig})
+checkdepends=(chromium xorg-server-xvfb)
+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'
-            'SKIP')
+            'SKIP'
+            '83f7ec59f2fa3fd1978337c5aedf73a988b150f4336ed75d6a55bb632185d6b3'
+            '9a302f8aebb5a0a8dbba3636d8bdc1e34295149c044975cd8bc8fc96545532f2')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy <tardyp at gmail.com> (@tardyp on GitHub)
   'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas <povilas at radix.lt> (@p12tic on GitHub)
@@ -24,7 +29,12 @@
 prepare() {
   cd "$srcdir"/buildbot-$pkgver
   # HACK: do not use virtualenv
-  sed -i 's#frontend_deps:.*#frontend_deps:#' Makefile
+  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
 }
 
 build() {
@@ -41,6 +51,11 @@
   done
 }
 
+check() {
+  cd "$srcdir"/buildbot-$pkgver
+  CHROME_BIN=/usr/bin/chromium xvfb-run make frontend_tests
+}
+
 package_python-buildbot-www() {
   pkgdesc='Buildbot UI'
   # Not depending on buildbot so that buildbot can easily use

Added: disable-broken-www-tests.patch
===================================================================
--- disable-broken-www-tests.patch	                        (rev 0)
+++ disable-broken-www-tests.patch	2019-08-20 13:38:09 UTC (rev 500297)
@@ -0,0 +1,18 @@
+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);
+     });
++    */
+ });