Skip to content
This repository has been archived by the owner on May 13, 2020. It is now read-only.

Commit

Permalink
fixing test which I missed when switched to pypi.release_urls
Browse files Browse the repository at this point in the history
  • Loading branch information
@agroszer
agroszer committed May 16, 2017
1 parent d0777e1 commit 933a78c
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 61 deletions.
4 changes: 1 addition & 3 deletions src/zope/wineggbuilder/build.py
View file
Expand Up @@ -132,7 +132,6 @@ def build(self, package, version, files, sourceFolder, status):
class Package(object):
#hook to enable testing
pypiKlass = base.PYPI
urlGetterKlass = base.URLGetter
svnKlass = base.SVN
gitKlass = base.Git
dlKlass = base.Download
Expand Down Expand Up @@ -229,14 +228,13 @@ def skip(version):
return

#2 get file list of each version
LOGGER.debug('getting %s', self.pypiurl)

verFiles = defaultdict(list)
gotSource = False

for version in versions:
for rdata in pypi.release_urls(self.name, version):
filename = rdata['filename']
LOGGER.debug('Got a file: %s', filename)
verFiles[version].append(filename)

if (filename.lower().endswith('.zip')
Expand Down
26 changes: 11 additions & 15 deletions src/zope/wineggbuilder/test.txt
View file
Expand Up @@ -16,33 +16,30 @@ Install mocks:
>>> oldPYPI = build.Package.pypiKlass
>>> build.Package.pypiKlass = testing.MockPYPI()

>>> oldURLgetter = build.Package.urlGetterKlass
>>> build.Package.urlGetterKlass = testing.MockURLGetter()

Let's see:

>>> import os.path
>>> testininame = os.path.join(os.path.dirname(build.__file__), 'test.ini')
>>> build.main([testininame, '-v', '-s']) # doctest: +REPORT_NDIFF
INFO - loading configuration from ...\src\zope\wineggbuilder\test.ini
INFO - loading configuration from ...test.ini
INFO - Starting to build
INFO - Processing zope.proxy [zope.proxy_34_to_35]
DEBUG - getting http://pypi.python.org/simple/zope.proxy/
DEBUG - Got a file: zope.proxy-3.5.0-py2.6-win-amd64.egg
DEBUG - Got a file: zope.proxy-3.5.0-py2.6-win32.egg
DEBUG - Got a file: zope.proxy-3.4.0-py2.4-win32.egg
DEBUG - Got a file: zope.proxy-3.4.0.tar.gz
DEBUG - Got a file: zope.proxy-3.5.0-py2.5-win32.egg
DEBUG - Got a file: zope.proxy-3.5.0.tar.gz
DEBUG - Got a file: zope.proxy-3.4.2.zip
DEBUG - Got a file: zope.proxy-3.5.0-py2.4-win32.egg
DEBUG - Got a file: zope.proxy-3.4.2-py2.6-win32.egg
DEBUG - Got a file: zope.proxy-3.4.0-py2.5-win32.egg
DEBUG - Got a file: zope.proxy-3.4.0.zip
DEBUG - Got a file: zope.proxy-3.4.1-py2.4-win32.egg
DEBUG - Got a file: zope.proxy-3.4.1.zip
DEBUG - Got a file: zope.proxy-3.4.2-py2.5-win32.egg
DEBUG - Got a file: zope.proxy-3.4.2-py2.4-win32.egg
DEBUG - Got a file: zope.proxy-3.4.0-py2.5-win32.egg
DEBUG - Got a file: zope.proxy-3.4.0.zip
DEBUG - Got a file: zope.proxy-3.4.2.zip
DEBUG - Got a file: zope.proxy-3.4.2-py2.6-win32.egg
DEBUG - Got a file: zope.proxy-3.4.2-py2.6-win32.egg
DEBUG - Got a file: zope.proxy-3.5.0-py2.6-win-amd64.egg
DEBUG - Got a file: zope.proxy-3.5.0-py2.6-win32.egg
DEBUG - Got a file: zope.proxy-3.5.0-py2.5-win32.egg
DEBUG - Got a file: zope.proxy-3.5.0.tar.gz
DEBUG - Got a file: zope.proxy-3.5.0-py2.4-win32.egg
DEBUG - Checking if build required for [zope.proxy_34_to_35] zope.proxy 3.4.0 py25_32
DEBUG - Build not required for [zope.proxy_34_to_35] zope.proxy 3.4.0 py25_32
DEBUG - Checking if build required for [zope.proxy_34_to_35] zope.proxy 3.4.0 py26_32
Expand Down Expand Up @@ -306,4 +303,3 @@ Remove mocks:
>>> base.SVN.commandKlass = oldSVNcommand
>>> build.Compiler.commandKlass = oldCompilerCommand
>>> build.Package.pypiKlass = oldPYPI
>>> build.Package.urlGetterKlass = oldURLgetter
84 changes: 41 additions & 43 deletions src/zope/wineggbuilder/testing.py
View file
Expand Up @@ -238,6 +238,44 @@ def do(self, cmd):
'zope.proxy': ['3.6.0', '3.5.0', '3.4.2', '3.4.1', '3.4.0', '3.3.0'],
}

# only filename is used
RELEASE_URLS = {
'zope.proxy': {
'3.3.0': [
{'filename': 'zope.proxy-3.3.0-py2.5-win32.egg'},
{'filename': 'zope.proxy-3.3.0.tar.gz'},
{'filename': 'zope.proxy-3.3.0-py2.4-win32.egg'},
],
'3.4.0': [
{'filename': 'zope.proxy-3.4.0-py2.4-win32.egg'},
{'filename': 'zope.proxy-3.4.0.tar.gz'},
{'filename': 'zope.proxy-3.4.0-py2.5-win32.egg'},
{'filename': 'zope.proxy-3.4.0.zip'},
],
'3.4.1': [
{'filename': 'zope.proxy-3.4.1-py2.4-win32.egg'},
{'filename': 'zope.proxy-3.4.1.zip'},
],
'3.4.2': [
{'filename': 'zope.proxy-3.4.2-py2.5-win32.egg'},
{'filename': 'zope.proxy-3.4.2-py2.4-win32.egg'},
{'filename': 'zope.proxy-3.4.2.zip'},
{'filename': 'zope.proxy-3.4.2-py2.6-win32.egg'},
{'filename': 'zope.proxy-3.4.2-py2.6-win32.egg'},
],
'3.5.0': [
{'filename': 'zope.proxy-3.5.0-py2.6-win-amd64.egg'},
{'filename': 'zope.proxy-3.5.0-py2.6-win32.egg'},
{'filename': 'zope.proxy-3.5.0-py2.5-win32.egg'},
{'filename': 'zope.proxy-3.5.0.tar.gz'},
{'filename': 'zope.proxy-3.5.0-py2.4-win32.egg'},
],
'3.6.0': [
{'filename': 'zope.proxy-3.6.0-py2.6-win-amd64.egg'},
{'filename': 'zope.proxy-3.6.0-py2.6-win32.egg'},
],
}}

class MockPYPI(object):
def __init__(self):
pass
Expand All @@ -254,9 +292,9 @@ def package_releases(self, package_name, show_hidden=False):

return PYPI_RELEASES[package_name]

#def release_urls(self, package_name, version):
# pass
#
def release_urls(self, package_name, version):
return RELEASE_URLS[package_name][version]

#def release_data(self, package_name, version):
# pass
#
Expand All @@ -265,43 +303,3 @@ def package_releases(self, package_name, show_hidden=False):
#
#def changelog(self, since):
# pass

RESPONSES = {
'http://pypi.python.org/simple/zope.proxy/' :
"""<html><head><title>Links for zope.proxy</title></head><body><h1>Links for zope.proxy</h1><a href="../../packages/source/z/zope.proxy/zope.proxy-3.6.0.zip#md5=896d9c53837d01875fe55cc69f43f7aa">zope.proxy-3.6.0.zip</a><br/>
<a href="../../packages/2.6/z/zope.proxy/zope.proxy-3.6.0-py2.6-win-amd64.egg#md5=8cb96ee292e127df8c4524ec486a05b6">zope.proxy-3.6.0-py2.6-win-amd64.egg</a><br/>
<a href="../../packages/2.6/z/zope.proxy/zope.proxy-3.5.0-py2.6-win-amd64.egg#md5=f3bdd81ef3d3f21db5cb4d9fe99b2b6e">zope.proxy-3.5.0-py2.6-win-amd64.egg</a><br/>
<a href="../../packages/2.6/z/zope.proxy/zope.proxy-3.5.0-py2.6-win32.egg#md5=ae9c7e9ecf949422abd98c23507636ac">zope.proxy-3.5.0-py2.6-win32.egg</a><br/>
<a href="../../packages/2.4/z/zope.proxy/zope.proxy-3.4.0-py2.4-win32.egg#md5=c23cda9412f8859d0d2d36c16e69a5a8">zope.proxy-3.4.0-py2.4-win32.egg</a><br/>
<a href="../../packages/source/z/zope.proxy/zope.proxy-3.4.0.tar.gz#md5=a9e234e90bc4a16bb62b967d4a0412c6">zope.proxy-3.4.0.tar.gz</a><br/>
<a href="../../packages/2.5/z/zope.proxy/zope.proxy-3.5.0-py2.5-win32.egg#md5=7ea1aa4dd320e9cceaae5031026259cc">zope.proxy-3.5.0-py2.5-win32.egg</a><br/>
<a href="../../packages/source/z/zope.proxy/zope.proxy-3.5.0.tar.gz#md5=ac5fc916b572bc3ff630b49cda52d94a">zope.proxy-3.5.0.tar.gz</a><br/>
<a href="../../packages/source/z/zope.proxy/zope.proxy-3.4.2.zip#md5=ad51f25d4d86be7cfebb70bd77421f92">zope.proxy-3.4.2.zip</a><br/>
<a href="../../packages/2.4/z/zope.proxy/zope.proxy-3.5.0-py2.4-win32.egg#md5=8c73b52e76f6aea17b1542b85d8b58f4">zope.proxy-3.5.0-py2.4-win32.egg</a><br/>
<a href="../../packages/2.6/z/zope.proxy/zope.proxy-3.4.2-py2.6-win32.egg#md5=3eff1609ba267b2b3becbe2eb37fb401">zope.proxy-3.4.2-py2.6-win32.egg</a><br/>
<a href="../../packages/2.4/z/zope.proxy/zope.proxy-3.4.1-py2.4-win32.egg#md5=02da4f1338131d7feffabe06488962c6">zope.proxy-3.4.1-py2.4-win32.egg</a><br/>
<a href="../../packages/source/z/zope.proxy/zope.proxy-3.4.1.zip#md5=b4d5c7345a7a2a60071a6f62db9592c6">zope.proxy-3.4.1.zip</a><br/>
<a href="../../packages/2.5/z/zope.proxy/zope.proxy-3.4.2-py2.5-win32.egg#md5=6c1661131b0dd8c8e667b47d1e7707e7">zope.proxy-3.4.2-py2.5-win32.egg</a><br/>
<a href="../../packages/2.4/z/zope.proxy/zope.proxy-3.4.2-py2.4-win32.egg#md5=67184719dfe56838be7241391721f11d">zope.proxy-3.4.2-py2.4-win32.egg</a><br/>
<a href="../../packages/2.5/z/zope.proxy/zope.proxy-3.4.0-py2.5-win32.egg#md5=aa0e2c00e011b026820630150ca028ba">zope.proxy-3.4.0-py2.5-win32.egg</a><br/>
<a href="../../packages/2.5/z/zope.proxy/zope.proxy-3.3.0-py2.5-win32.egg#md5=bcf3c132a36906787a07aac7226cbb1b">zope.proxy-3.3.0-py2.5-win32.egg</a><br/>
<a href="../../packages/source/z/zope.proxy/zope.proxy-3.3.0.tar.gz#md5=64128ab4feeb5bfd8a66c4cdd5192a31">zope.proxy-3.3.0.tar.gz</a><br/>
<a href="../../packages/2.6/z/zope.proxy/zope.proxy-3.6.0-py2.6-win32.egg#md5=6984986850f74abdb3cd0c738579cb16">zope.proxy-3.6.0-py2.6-win32.egg</a><br/>
<a href="../../packages/source/z/zope.proxy/zope.proxy-3.4.0.zip#md5=3fef9f29c8b920c9f20aa3a2f92afa70">zope.proxy-3.4.0.zip</a><br/>
<a href="../../packages/2.4/z/zope.proxy/zope.proxy-3.3.0-py2.4-win32.egg#md5=554d10d694d7e5ea9468d88c1c078387">zope.proxy-3.3.0-py2.4-win32.egg</a><br/>
<a href="http://svn.zope.org/zope.proxy" rel="homepage">3.3.0 home_page</a><br/>
<a href="http://docs.python.org/ref/sequence-methods.html">http://docs.python.org/ref/sequence-methods.html</a><br/>
</body></html>""",
}

class MockURLGetter(object):
def __init__(self):
pass

def __call__(self):
return self

def get(self, url):
global MOCKLOG
MOCKLOG.append('urlget: %s' % url)
return RESPONSES[url]

0 comments on commit 933a78c

Please sign in to comment.