Remove internal Swift support
The zuul v3 architecture does not require that this be supported
as an internal special case. Remove it for now in the expectation
that we will implement similar functionality using the auth system
and Ansible roles.
Change-Id: I9c1e05a716ce8cfb5f66c4688db110c320d33b4b
diff --git a/tests/base.py b/tests/base.py
index 0221a9e..f26863e 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -32,7 +32,6 @@
import socket
import string
import subprocess
-import swiftclient
import sys
import tempfile
import threading
@@ -60,7 +59,6 @@
import zuul.rpclistener
import zuul.launcher.server
import zuul.launcher.client
-import zuul.lib.swift
import zuul.lib.connections
import zuul.merger.client
import zuul.merger.merger
@@ -904,18 +902,6 @@
return True
-class FakeSwiftClientConnection(swiftclient.client.Connection):
- def post_account(self, headers):
- # Do nothing
- pass
-
- def get_auth(self):
- # Returns endpoint and (unused) auth token
- endpoint = os.path.join('https://storage.example.org', 'V1',
- 'AUTH_account')
- return endpoint, ''
-
-
class FakeNodepool(object):
REQUEST_ROOT = '/nodepool/requests'
NODE_ROOT = '/nodepool/nodes'
@@ -1332,11 +1318,6 @@
self.sched = zuul.scheduler.Scheduler(self.config)
- self.useFixture(fixtures.MonkeyPatch('swiftclient.client.Connection',
- FakeSwiftClientConnection))
-
- self.swift = zuul.lib.swift.Swift(self.config)
-
self.event_queues = [
self.sched.result_event_queue,
self.sched.trigger_event_queue,
@@ -1367,7 +1348,7 @@
self.builds = self.launch_server.running_builds
self.launch_client = zuul.launcher.client.LaunchClient(
- self.config, self.sched, self.swift)
+ self.config, self.sched)
self.merge_client = zuul.merger.client.MergeClient(
self.config, self.sched)
self.nodepool = zuul.nodepool.Nodepool(self.sched)