From b76e8b6c412ab48de3d57b09013d58af152f6030 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Wed, 22 Apr 2015 09:02:39 +0000
Subject: [PATCH] Revert "Update unit tests for determine_authenticator"

This reverts commit 79f5ebe734d18ddbc70dfbd22de4ce76f995a20a.
---
 .gitignore                              |  2 +-
 letsencrypt/client/tests/client_test.py | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 51164db97..2e0578223 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@ m3
 *~
 .vagrant
 *.swp
-\#*#
+\#*#
\ No newline at end of file
diff --git a/letsencrypt/client/tests/client_test.py b/letsencrypt/client/tests/client_test.py
index 2310dbe87..1c1a0d68a 100644
--- a/letsencrypt/client/tests/client_test.py
+++ b/letsencrypt/client/tests/client_test.py
@@ -1,5 +1,4 @@
 """letsencrypt.client.client.py tests."""
-from collections import namedtuple
 import unittest
 
 import mock
@@ -21,18 +20,12 @@ class DetermineAuthenticatorTest(unittest.TestCase):
 
         self.mock_config = mock.Mock()
 
-        self.all_auths = {
-            'apache': self.mock_apache,
-            'standalone': self.mock_stand
-        }
+        self.all_auths = [self.mock_apache, self.mock_stand]
 
     @classmethod
     def _call(cls, all_auths):
         from letsencrypt.client.client import determine_authenticator
-        # TODO: add tests for setting the authenticator via the command line
-        mock_config = namedtuple("Config", ['authenticator'])
-        return determine_authenticator(all_auths,
-                                       mock_config(authenticator=None))
+        return determine_authenticator(all_auths)
 
     @mock.patch("letsencrypt.client.client.display_ops.choose_authenticator")
     def test_accept_two(self, mock_choose):
@@ -42,8 +35,7 @@ class DetermineAuthenticatorTest(unittest.TestCase):
     def test_accept_one(self):
         self.mock_apache.prepare.return_value = self.mock_apache
         self.assertEqual(
-            self._call(dict(apache=self.all_auths['apache'])),
-            self.mock_apache)
+            self._call(self.all_auths[:1]), self.mock_apache)
 
     def test_no_installation_one(self):
         self.mock_apache.prepare.side_effect = (