From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE662138335 for ; Wed, 27 Feb 2019 05:35:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C47CCE089C; Wed, 27 Feb 2019 05:35:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81858E089C for ; Wed, 27 Feb 2019 05:35:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C638F335C94 for ; Wed, 27 Feb 2019 05:35:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A61344B for ; Wed, 27 Feb 2019 05:35:37 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1551245723.06a5475f28a79c335d45c2afc8f89779161c83ac.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch dev-util/buildbot/files/disable-test_userpass_wait.patch X-VCS-Directories: dev-util/buildbot/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 06a5475f28a79c335d45c2afc8f89779161c83ac X-VCS-Branch: master Date: Wed, 27 Feb 2019 05:35:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6cf502e1-d065-4ec4-9480-fa120cfb46af X-Archives-Hash: 7c48c495099a5fc92aa9ef7fdd701372 commit: 06a5475f28a79c335d45c2afc8f89779161c83ac Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Feb 18 17:33:50 2019 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Wed Feb 27 05:35:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a5475f dev-util/buildbot: remove unused patches Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11098 Signed-off-by: Aaron Bauman gentoo.org> ...uildbot-0.9.15_p1-buildbotworkerdocker.py.patch | 32 ---------------------- .../files/disable-test_userpass_wait.patch | 24 ---------------- 2 files changed, 56 deletions(-) diff --git a/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch b/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch deleted file mode 100644 index db08d7a45dd..00000000000 --- a/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7051ebdac8c8a9054e8a37ab7dd8fb6f0ac1affb Mon Sep 17 00:00:00 2001 -From: Brian Dolbec -Date: Mon, 15 Jan 2018 13:50:36 -0800 -Subject: [PATCH] master/buildbot/worker/docker.py: Fix test fail when docker - is not installed - -This fixes numerous tracebacks (note, only partial traceback): - - File "/usr/lib64/python3.6/site-packages/buildbot/worker/docker.py", line 259, in _thd_start_instance - if docker_py_version >= 2.2: -builtins.NameError: name 'docker_py_version' is not defined - -With this patch, the tests pass. ---- - master/buildbot/worker/docker.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/buildbot/worker/docker.py b/master/buildbot/worker/docker.py -index 62e30785f..e558d69ff 100644 ---- a/buildbot/worker/docker.py -+++ b/buildbot/worker/docker.py -@@ -41,6 +41,7 @@ try: - except ImportError: - docker = None - client = None -+ docker_py_version = 0.0 - - - def _handle_stream_line(line): --- -2.15.1 - diff --git a/dev-util/buildbot/files/disable-test_userpass_wait.patch b/dev-util/buildbot/files/disable-test_userpass_wait.patch deleted file mode 100644 index e7b9d0a59e3..00000000000 --- a/dev-util/buildbot/files/disable-test_userpass_wait.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e24640e1043fe8914a2b86842645604a3d9e9698 Mon Sep 17 00:00:00 2001 -From: Brian Dolbec -Date: Tue, 13 Mar 2018 19:59:13 +0000 -Subject: [PATCH] disable test-userpass-wait - ---- - master/buildbot/test/integration/test_try_client.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/buildbot/test/integration/test_try_client.py b/buildbot/test/integration/test_try_client.py -index 9bdc7a63a..48fcb1573 100644 ---- a/buildbot/test/integration/test_try_client.py -+++ b/buildbot/test/integration/test_try_client.py -@@ -142,6 +142,8 @@ class Schedulers(RunMasterBase, www.RequiresWwwMixin): - - @defer.inlineCallbacks - def test_userpass_wait(self): -+ if os.environ.get("DISABLE_TEST", False): -+ return - yield self.startMaster( - trysched.Try_Userpass('try', ['a'], 0, [('u', b'p')])) - yield self.runClient({ --- -2.13.6