diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
commit | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch) | |
tree | 3cb05783d73b2c33589ba305144a31c718e123cd /dev-util/buildbot/files | |
parent | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff) |
gentoo resync : 03.03.2019
Diffstat (limited to 'dev-util/buildbot/files')
-rw-r--r-- | dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch | 32 | ||||
-rw-r--r-- | dev-util/buildbot/files/disable-test_userpass_wait.patch | 24 |
2 files changed, 0 insertions, 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 db08d7a45dd3..000000000000 --- 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 <dolsen@gentoo.org> -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 e7b9d0a59e36..000000000000 --- 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 <brian.dolbec@sony.com> -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 |