Merge 3.4

This commit is contained in:
Donald Stufft 2016-08-03 18:49:19 -04:00
commit ef330d35c8
3 changed files with 6 additions and 6 deletions

View file

@ -95,7 +95,7 @@ class PyPIRCCommandTestCase(BasePyPIRCCommandTestCase):
config = list(sorted(config.items()))
waited = [('password', 'secret'), ('realm', 'pypi'),
('repository', 'https://upload.pypi.io/legacy/'),
('repository', 'https://upload.pypi.org/legacy/'),
('server', 'server1'), ('username', 'me')]
self.assertEqual(config, waited)
@ -104,7 +104,7 @@ class PyPIRCCommandTestCase(BasePyPIRCCommandTestCase):
config = cmd._read_pypirc()
config = list(sorted(config.items()))
waited = [('password', 'secret'), ('realm', 'pypi'),
('repository', 'https://upload.pypi.io/legacy/'),
('repository', 'https://upload.pypi.org/legacy/'),
('server', 'server-login'), ('username', 'tarek')]
self.assertEqual(config, waited)
@ -130,7 +130,7 @@ class PyPIRCCommandTestCase(BasePyPIRCCommandTestCase):
config = list(sorted(config.items()))
waited = [('password', 'yh^%#rest-of-my-password'), ('realm', 'pypi'),
('repository', 'https://upload.pypi.io/legacy/'),
('repository', 'https://upload.pypi.org/legacy/'),
('server', 'server3'), ('username', 'cbiggles')]
self.assertEqual(config, waited)