[arch-commits] Commit in buildbot/repos/community-any (4 files)

Chih-Hsuan Yen yan12125 at archlinux.org
Wed Dec 9 08:30:54 UTC 2020


    Date: Wednesday, December 9, 2020 @ 08:30:53
  Author: yan12125
Revision: 772326

archrelease: copy trunk to community-any

Added:
  buildbot/repos/community-any/PKGBUILD
    (from rev 772325, buildbot/trunk/PKGBUILD)
  buildbot/repos/community-any/subunit-tests.diff
    (from rev 772325, buildbot/trunk/subunit-tests.diff)
Deleted:
  buildbot/repos/community-any/PKGBUILD
  buildbot/repos/community-any/subunit-tests.diff

--------------------+
 PKGBUILD           |  483 +++++++++++++++++++++++++--------------------------
 subunit-tests.diff |   74 +++----
 2 files changed, 280 insertions(+), 277 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-09 08:30:29 UTC (rev 772325)
+++ PKGBUILD	2020-12-09 08:30:53 UTC (rev 772326)
@@ -1,240 +0,0 @@
-# Maintainer: Chih-Hsuan Yen <yan12125 at gmail.com>
-# Contributor: xRemaLx <anton.komolov at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgbase=buildbot
-pkgname=(buildbot buildbot-worker buildbot-docs
-         python-buildbot-www python-buildbot-waterfall-view
-         python-buildbot-console-view python-buildbot-grid-view
-         python-buildbot-wsgi-dashboards python-buildbot-badges)
-pkgver=2.9.1
-_bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=1
-arch=(any)
-url='https://buildbot.net'
-license=(GPL2)
-checkdepends=(python-boto3 python-lz4 python-treq python-txrequests
-              python-moto python-parameterized python-mock python-subunit
-              openssh chromium)
-makedepends=(python-twisted python-jinja python-zope-interface
-             python-sqlalchemy-migrate python-dateutil python-txaio
-             python-autobahn python-pyjwt python-yaml
-             python-setuptools python-future
-             python-sphinx-jinja python-sphinxcontrib-blockdiag
-             python-sphinx_rtd_theme
-             git yarn)
-source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.asc}
-        "git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit"
-        "subunit-tests.diff")
-sha256sums=('388e0a757019b73148f6552c1cccbc13e998f13cacb32e56e4c85387b0adbc75'
-            'SKIP'
-            'SKIP'
-            'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55')
-validpgpkeys=(
-  '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy <tardyp at gmail.com> (@tardyp on GitHub)
-  'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas <povilas at radix.lt> (@p12tic on GitHub)
-)
-
-prepare() {
-  cd buildbot-$pkgver
-
-  # Some master tests use scripts from contrib
-  ln -s ../../buildbot-contrib/master/contrib master/contrib
-
-  # HACK: do not use virtualenv
-  sed -i -e 's#frontend_deps:.*#frontend_deps:#' Makefile
-
-  # HACK: Do not build JS again during install
-  # We take care about the command order manually
-  sed -i '/egg_info=EggInfoCommand/d' pkg/buildbot_pkg.py
-
-  sed -i '/buildbot_windows_service/d' master/setup.py
-  rm -v master/buildbot/scripts/windows_service.py
-  sed -i '/buildbot_worker_windows_service/d' worker/setup.py
-  rm -v worker/buildbot_worker/scripts/windows_service.py
-
-  # Subunit logs are from testtools. Arch Linux's testtools is patched to use
-  # traceback instead of traceback2, and causing a difference. See
-  # https://github.com/testing-cabal/testtools/pull/299 for more defailts.
-  patch -Np1 -i ../subunit-tests.diff
-}
-
-build() {
-  export NODE_OPTIONS="--max-old-space-size=2048"
-
-  cd "$srcdir"/buildbot-$pkgver/pkg
-  python setup.py egg_info
-
-  #################### buildbot ########################
-  cd "$srcdir"/buildbot-$pkgver/master
-  python setup.py build
-
-  ################## buildbot-worker ###################
-  cd "$srcdir"/buildbot-$pkgver/worker
-  python setup.py build
-
-  ################### buildbot-www #####################
-  cd "$srcdir"/buildbot-$pkgver
-
-  # HACK: use system packages instead of ones via pip
-  make PIP=/usr/bin/true frontend_deps
-
-  export PYTHONPATH="$srcdir"/buildbot-$pkgver/pkg
-  for module in base waterfall_view console_view grid_view wsgi_dashboards badges
-  do
-    cd "$srcdir"/buildbot-$pkgver/www/$module
-    python setup.py build
-  done
-
-  ################### buildbot-docs ####################
-  cd "$srcdir"/buildbot-$pkgver/master/docs
-  make clean html singlehtml
-}
-
-check() {
-  # Install packages to a temp folder for tests
-  cd "$srcdir"/buildbot-$pkgver/master
-  python setup.py egg_info
-  python setup.py install_scripts --install-dir="$srcdir/tmp_install"
-
-  cd "$srcdir"/buildbot-$pkgver/worker
-  python setup.py egg_info
-
-  cd "$srcdir"/buildbot-$pkgver/www/base
-  python setup.py egg_info
-
-  # Run tests
-  _basedir="$srcdir/buildbot-$pkgver"
-  export PYTHONPATH="$_basedir/master:$_basedir/worker:$_basedir/www/base:$_basedir/pkg"
-  export PATH="$PATH:$srcdir/tmp_install"
-
-  cd "$srcdir"/buildbot-$pkgver/master
-  TZ=UTC trial3 --rterrors buildbot
-
-  cd "$srcdir"/buildbot-$pkgver/worker
-  PYTHONPATH=. trial3 buildbot_worker
-
-  for module in base waterfall_view console_view grid_view wsgi_dashboards
-  do
-    cd "$srcdir"/buildbot-$pkgver/www/$module
-    CHROME_BIN=/usr/bin/chromium yarn run test --browsers BBChromeHeadless
-  done
-}
-
-package_buildbot() {
-  pkgdesc='The Continuous Integration Framework'
-  # include setuptools as plugins are enumerated via pkg_resources
-  depends=(python-twisted python-jinja python-zope-interface
-           python-sqlalchemy-migrate python-dateutil python-txaio
-           python-autobahn python-pyjwt python-yaml python-setuptools)
-  optdepends=(
-    # reporters
-    'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers'
-    # secrets
-    'pass: to use SecretInPass provider'
-    'vault: to use HashiCorpVaultSecretProvider provider'
-    # statistics
-    'python-influxdb: for using InfluxDB to store statistics'
-    # steps
-    'python-subunit: for SubunitShellCommand'
-    'python-treq: for using HTTP requests as steps'
-    'python-requests: for using HTTP requests as steps'
-    'python-txrequests: for using HTTP requests as steps'
-    # workers
-    'buildbot-worker: for local worker'
-    'libvirt-python: for libvirt worker'
-    'python-boto3: for AWS EC2 latent worker'
-    'python-docker: for Docker latent worker'
-    'python-novaclient: for OpenStack latent worker'
-    # www
-    'python-ldap3: to authenticate users via LDAP'
-    'python-pypugjs: to use custom Pug.js templates'
-
-    # misc
-    'python-lz4: to compress logs using lz4'
-  )
-
-  cd buildbot-$pkgver/master
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  install -Dm644 "$srcdir"/buildbot-contrib/master/contrib/systemd/buildbot at .service \
-    -t "$pkgdir"/usr/lib/systemd/system/
-}
-
-package_buildbot-worker() {
-  pkgdesc='Buildbot worker daemon'
-  depends=(python-twisted python-future)
-
-  cd buildbot-$pkgver/worker
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  install -Dm644 "$srcdir"/buildbot-contrib/worker/contrib/systemd/buildbot-worker at .service \
-    -t "$pkgdir"/usr/lib/systemd/system/
-}
-
-package_buildbot-docs() {
-  pkgdesc='Buildbot docs'
-
-  cd buildbot-$pkgver/master/docs
-  install -Ddm755 "$pkgdir"/usr/share/doc/buildbot
-  for kind in html singlehtml ; do
-    cp -dr --no-preserve=ownership _build/$kind "$pkgdir"/usr/share/doc/buildbot/$kind
-  done
-}
-
-package_python-buildbot-www() {
-  pkgdesc='Buildbot UI'
-  depends=(python buildbot)
-  optdepends=(
-    'python-buildbot-waterfall-view'
-    'python-buildbot-console-view'
-    'python-buildbot-grid-view'
-    'python-buildbot-badges'
-  )
-
-  cd buildbot-$pkgver/www/base
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-waterfall-view() {
-  pkgdesc='Buildbot Waterfall View plugin'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/waterfall_view
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-console-view() {
-  pkgdesc='Buildbot Console View plugin'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/console_view
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-grid-view() {
-  pkgdesc='Buildbot Grid View plugin'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/grid_view
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-wsgi-dashboards() {
-  pkgdesc='Buildbot plugin to integrate flask or bottle dashboards to buildbot UI'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/wsgi_dashboards
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-badges() {
-  pkgdesc='Buildbot badges'
-  depends=(python-buildbot-www python-klein python-cairosvg python-cairocffi python-jinja)
-  # https://github.com/buildbot/buildbot/blob/v1.6.0/www/badges/buildbot_badges/__init__.py#L40
-  optdepends=(
-    'ttf-dejavu: the default font for rendering badges as PNGs'
-  )
-
-  cd buildbot-$pkgver/www/badges
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}

Copied: buildbot/repos/community-any/PKGBUILD (from rev 772325, buildbot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-12-09 08:30:53 UTC (rev 772326)
@@ -0,0 +1,243 @@
+# Maintainer: Chih-Hsuan Yen <yan12125 at gmail.com>
+# Contributor: xRemaLx <anton.komolov at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgbase=buildbot
+pkgname=(buildbot buildbot-worker buildbot-docs
+         python-buildbot-www python-buildbot-waterfall-view
+         python-buildbot-console-view python-buildbot-grid-view
+         python-buildbot-wsgi-dashboards python-buildbot-badges)
+pkgver=2.9.2
+_bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
+pkgrel=1
+arch=(any)
+url='https://buildbot.net'
+license=(GPL2)
+checkdepends=(python-boto3 python-lz4 python-treq python-txrequests
+              python-moto python-parameterized python-mock python-subunit
+              openssh chromium)
+makedepends=(python-twisted python-jinja python-zope-interface
+             python-sqlalchemy-migrate python-dateutil python-txaio
+             python-autobahn python-pyjwt python-yaml
+             python-setuptools python-future
+             python-sphinx-jinja python-sphinxcontrib-blockdiag
+             python-sphinx_rtd_theme
+             git yarn)
+source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.asc}
+        "git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit"
+        "subunit-tests.diff")
+sha256sums=('7072d39fac7cd126e7bf6bed6e14b94bb6c86c360caf12e69c578af305e2883a'
+            'SKIP'
+            'SKIP'
+            'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55')
+validpgpkeys=(
+  '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy <tardyp at gmail.com> (@tardyp on GitHub)
+  'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas <povilas at radix.lt> (@p12tic on GitHub)
+)
+
+prepare() {
+  cd buildbot-$pkgver
+
+  # Some master tests use scripts from contrib
+  ln -s ../../buildbot-contrib/master/contrib master/contrib
+
+  # HACK: do not use virtualenv
+  sed -i -e 's#frontend_deps:.*#frontend_deps:#' Makefile
+
+  # HACK: Do not build JS again during install
+  # We take care about the command order manually
+  sed -i '/egg_info=EggInfoCommand/d' pkg/buildbot_pkg.py
+
+  sed -i '/buildbot_windows_service/d' master/setup.py
+  rm -v master/buildbot/scripts/windows_service.py
+  sed -i '/buildbot_worker_windows_service/d' worker/setup.py
+  rm -v worker/buildbot_worker/scripts/windows_service.py
+
+  # Subunit logs are from testtools. Arch Linux's testtools is patched to use
+  # traceback instead of traceback2, and causing a difference. See
+  # https://github.com/testing-cabal/testtools/pull/299 for more defailts.
+  patch -Np1 -i ../subunit-tests.diff
+}
+
+build() {
+  export NODE_OPTIONS="--max-old-space-size=2048"
+
+  cd "$srcdir"/buildbot-$pkgver/pkg
+  python setup.py egg_info
+
+  #################### buildbot ########################
+  cd "$srcdir"/buildbot-$pkgver/master
+  python setup.py build
+
+  ################## buildbot-worker ###################
+  cd "$srcdir"/buildbot-$pkgver/worker
+  python setup.py build
+
+  ################### buildbot-www #####################
+  cd "$srcdir"/buildbot-$pkgver
+
+  # HACK: use system packages instead of ones via pip
+  make PIP=/usr/bin/true frontend_deps
+
+  export PYTHONPATH="$srcdir"/buildbot-$pkgver/pkg
+  for module in base waterfall_view console_view grid_view wsgi_dashboards badges
+  do
+    cd "$srcdir"/buildbot-$pkgver/www/$module
+    python setup.py build
+  done
+
+  ################### buildbot-docs ####################
+  cd "$srcdir"/buildbot-$pkgver/master/docs
+  make clean html singlehtml
+}
+
+check() {
+  # Install packages to a temp folder for tests
+  cd "$srcdir"/buildbot-$pkgver/master
+  python setup.py egg_info
+  python setup.py install_scripts --install-dir="$srcdir/tmp_install"
+
+  cd "$srcdir"/buildbot-$pkgver/worker
+  python setup.py egg_info
+
+  cd "$srcdir"/buildbot-$pkgver/www/base
+  python setup.py egg_info
+
+  # Run tests
+  _basedir="$srcdir/buildbot-$pkgver"
+  export PYTHONPATH="$_basedir/master:$_basedir/worker:$_basedir/www/base:$_basedir/pkg"
+  export PATH="$PATH:$srcdir/tmp_install"
+
+  cd "$srcdir"/buildbot-$pkgver/master
+  TZ=UTC trial3 --rterrors buildbot
+
+  cd "$srcdir"/buildbot-$pkgver/worker
+  PYTHONPATH=. trial3 buildbot_worker
+
+  for module in base waterfall_view console_view grid_view wsgi_dashboards
+  do
+    cd "$srcdir"/buildbot-$pkgver/www/$module
+    CHROME_BIN=/usr/bin/chromium yarn run test --browsers BBChromeHeadless
+  done
+}
+
+# use PYTHONHASHSEED=0 to work around https://bugs.python.org/issue34033 and https://bugs.python.org/issue34722
+export PYTHONHASHSEED=0
+
+package_buildbot() {
+  pkgdesc='The Continuous Integration Framework'
+  # include setuptools as plugins are enumerated via pkg_resources
+  depends=(python-twisted python-jinja python-zope-interface
+           python-sqlalchemy-migrate python-dateutil python-txaio
+           python-autobahn python-pyjwt python-yaml python-setuptools)
+  optdepends=(
+    # reporters
+    'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers'
+    # secrets
+    'pass: to use SecretInPass provider'
+    'vault: to use HashiCorpVaultSecretProvider provider'
+    # statistics
+    'python-influxdb: for using InfluxDB to store statistics'
+    # steps
+    'python-subunit: for SubunitShellCommand'
+    'python-treq: for using HTTP requests as steps'
+    'python-requests: for using HTTP requests as steps'
+    'python-txrequests: for using HTTP requests as steps'
+    # workers
+    'buildbot-worker: for local worker'
+    'libvirt-python: for libvirt worker'
+    'python-boto3: for AWS EC2 latent worker'
+    'python-docker: for Docker latent worker'
+    'python-novaclient: for OpenStack latent worker'
+    # www
+    'python-ldap3: to authenticate users via LDAP'
+    'python-pypugjs: to use custom Pug.js templates'
+
+    # misc
+    'python-lz4: to compress logs using lz4'
+  )
+
+  cd buildbot-$pkgver/master
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  install -Dm644 "$srcdir"/buildbot-contrib/master/contrib/systemd/buildbot at .service \
+    -t "$pkgdir"/usr/lib/systemd/system/
+}
+
+package_buildbot-worker() {
+  pkgdesc='Buildbot worker daemon'
+  depends=(python-twisted python-future)
+
+  cd buildbot-$pkgver/worker
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  install -Dm644 "$srcdir"/buildbot-contrib/worker/contrib/systemd/buildbot-worker at .service \
+    -t "$pkgdir"/usr/lib/systemd/system/
+}
+
+package_buildbot-docs() {
+  pkgdesc='Buildbot docs'
+
+  cd buildbot-$pkgver/master/docs
+  install -Ddm755 "$pkgdir"/usr/share/doc/buildbot
+  for kind in html singlehtml ; do
+    cp -dr --no-preserve=ownership _build/$kind "$pkgdir"/usr/share/doc/buildbot/$kind
+  done
+}
+
+package_python-buildbot-www() {
+  pkgdesc='Buildbot UI'
+  depends=(python buildbot)
+  optdepends=(
+    'python-buildbot-waterfall-view'
+    'python-buildbot-console-view'
+    'python-buildbot-grid-view'
+    'python-buildbot-badges'
+  )
+
+  cd buildbot-$pkgver/www/base
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-waterfall-view() {
+  pkgdesc='Buildbot Waterfall View plugin'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/waterfall_view
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-console-view() {
+  pkgdesc='Buildbot Console View plugin'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/console_view
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-grid-view() {
+  pkgdesc='Buildbot Grid View plugin'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/grid_view
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-wsgi-dashboards() {
+  pkgdesc='Buildbot plugin to integrate flask or bottle dashboards to buildbot UI'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/wsgi_dashboards
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-badges() {
+  pkgdesc='Buildbot badges'
+  depends=(python-buildbot-www python-klein python-cairosvg python-cairocffi python-jinja)
+  # https://github.com/buildbot/buildbot/blob/v1.6.0/www/badges/buildbot_badges/__init__.py#L40
+  optdepends=(
+    'ttf-dejavu: the default font for rendering badges as PNGs'
+  )
+
+  cd buildbot-$pkgver/www/badges
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}

Deleted: subunit-tests.diff
===================================================================
--- subunit-tests.diff	2020-12-09 08:30:29 UTC (rev 772325)
+++ subunit-tests.diff	2020-12-09 08:30:53 UTC (rev 772326)
@@ -1,37 +0,0 @@
-diff --git a/master/buildbot/test/unit/test_steps_subunit.py b/master/buildbot/test/unit/test_steps_subunit.py
-index 4e9f326b6..fdac4b17f 100644
---- a/master/buildbot/test/unit/steps/test_subunit.py
-+++ b/master/buildbot/test/unit/steps/test_subunit.py
-@@ -120,8 +120,7 @@ class TestSubUnit(steps.BuildStepMixin, TestReactorMixin, unittest.TestCase):
-         self.expectOutcome(result=FAILURE, state_string="shell Total 1 test(s) 1 error (failure)")
-         self.expectLogfile('problems', '''\
- test1
--testtools.testresult.real._StringException: Traceback (most recent call last):
--ValueError: invalid literal for int() with base 10: '_error1'
-+testtools.testresult.real._StringException: ValueError: invalid literal for int() with base 10: '_error1'
- 
- ''')
-         return self.runStep()
-@@ -148,12 +147,10 @@ ValueError: invalid literal for int() with base 10: '_error1'
-         self.expectOutcome(result=FAILURE, state_string="shell Total 2 test(s) 2 errors (failure)")
-         self.expectLogfile('problems', '''\
- test1
--testtools.testresult.real._StringException: Traceback (most recent call last):
--ValueError: invalid literal for int() with base 10: '_error1'
-+testtools.testresult.real._StringException: ValueError: invalid literal for int() with base 10: '_error1'
- 
- test2
--testtools.testresult.real._StringException: Traceback (most recent call last):
--ValueError: invalid literal for int() with base 10: '_error2'
-+testtools.testresult.real._StringException: ValueError: invalid literal for int() with base 10: '_error2'
- 
- ''')
-         return self.runStep()
-@@ -180,7 +177,6 @@ ValueError: invalid literal for int() with base 10: '_error2'
-         # note that the warnings list is ignored..
-         self.expectLogfile('warnings', '''\
- error: test2 [
--Traceback (most recent call last):
- ValueError: invalid literal for int() with base 10: '_error2'
- ]
- ''')

Copied: buildbot/repos/community-any/subunit-tests.diff (from rev 772325, buildbot/trunk/subunit-tests.diff)
===================================================================
--- subunit-tests.diff	                        (rev 0)
+++ subunit-tests.diff	2020-12-09 08:30:53 UTC (rev 772326)
@@ -0,0 +1,37 @@
+diff --git a/master/buildbot/test/unit/test_steps_subunit.py b/master/buildbot/test/unit/test_steps_subunit.py
+index 4e9f326b6..fdac4b17f 100644
+--- a/master/buildbot/test/unit/steps/test_subunit.py
++++ b/master/buildbot/test/unit/steps/test_subunit.py
+@@ -120,8 +120,7 @@ class TestSubUnit(steps.BuildStepMixin, TestReactorMixin, unittest.TestCase):
+         self.expectOutcome(result=FAILURE, state_string="shell Total 1 test(s) 1 error (failure)")
+         self.expectLogfile('problems', '''\
+ test1
+-testtools.testresult.real._StringException: Traceback (most recent call last):
+-ValueError: invalid literal for int() with base 10: '_error1'
++testtools.testresult.real._StringException: ValueError: invalid literal for int() with base 10: '_error1'
+ 
+ ''')
+         return self.runStep()
+@@ -148,12 +147,10 @@ ValueError: invalid literal for int() with base 10: '_error1'
+         self.expectOutcome(result=FAILURE, state_string="shell Total 2 test(s) 2 errors (failure)")
+         self.expectLogfile('problems', '''\
+ test1
+-testtools.testresult.real._StringException: Traceback (most recent call last):
+-ValueError: invalid literal for int() with base 10: '_error1'
++testtools.testresult.real._StringException: ValueError: invalid literal for int() with base 10: '_error1'
+ 
+ test2
+-testtools.testresult.real._StringException: Traceback (most recent call last):
+-ValueError: invalid literal for int() with base 10: '_error2'
++testtools.testresult.real._StringException: ValueError: invalid literal for int() with base 10: '_error2'
+ 
+ ''')
+         return self.runStep()
+@@ -180,7 +177,6 @@ ValueError: invalid literal for int() with base 10: '_error2'
+         # note that the warnings list is ignored..
+         self.expectLogfile('warnings', '''\
+ error: test2 [
+-Traceback (most recent call last):
+ ValueError: invalid literal for int() with base 10: '_error2'
+ ]
+ ''')



More information about the arch-commits mailing list