diff --git a/tests/integration/files/file/base/buildout/var/ver/1/bootstrap/bootstrap.py b/tests/integration/files/file/base/buildout/var/ver/1/bootstrap/bootstrap.py index d5e8be1cf2..8b13789179 100644 --- a/tests/integration/files/file/base/buildout/var/ver/1/bootstrap/bootstrap.py +++ b/tests/integration/files/file/base/buildout/var/ver/1/bootstrap/bootstrap.py @@ -1,277 +1 @@ -############################################################################## -# -# Copyright (c) 2006 Zope Foundation and Contributors. -# All Rights Reserved. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE. -# -############################################################################## -"""Bootstrap a buildout-based project -Simply run this script in a directory containing a buildout.cfg. -The script accepts buildout command-line options, so you can -use the -c option to specify an alternate configuration file. -""" - -import os, shutil, sys, tempfile, urllib, urllib2, subprocess -from optparse import OptionParser - -if sys.platform == 'win32': - def quote(c): - if ' ' in c: - return '"%s"' % c # work around spawn lamosity on windows - else: - return c -else: - quote = str - -# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments. -stdout, stderr = subprocess.Popen( - [sys.executable, '-Sc', - 'try:\n' - ' import ConfigParser\n' - 'except ImportError:\n' - ' print 1\n' - 'else:\n' - ' print 0\n'], - stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate() -has_broken_dash_S = bool(int(stdout.strip())) - -# In order to be more robust in the face of system Pythons, we want to -# run without site-packages loaded. This is somewhat tricky, in -# particular because Python 2.6's distutils imports site, so starting -# with the -S flag is not sufficient. However, we'll start with that: -if not has_broken_dash_S and 'site' in sys.modules: - # We will restart with python -S. - args = sys.argv[:] - args[0:0] = [sys.executable, '-S'] - args = map(quote, args) - os.execv(sys.executable, args) -# Now we are running with -S. We'll get the clean sys.path, import site -# because distutils will do it later, and then reset the path and clean -# out any namespace packages from site-packages that might have been -# loaded by .pth files. -clean_path = sys.path[:] -import site # imported because of its side effects -sys.path[:] = clean_path -for k, v in sys.modules.items(): - if k in ('setuptools', 'pkg_resources') or ( - hasattr(v, '__path__') and - len(v.__path__) == 1 and - not os.path.exists(os.path.join(v.__path__[0], '__init__.py'))): - # This is a namespace package. Remove it. - sys.modules.pop(k) - -is_jython = sys.platform.startswith('java') - -setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py' -distribute_source = 'http://python-distribute.org/distribute_setup.py' -distribute_source = 'https://bitbucket.org/pypa/setuptools/raw/f657df1f1ed46596d236376649c99a470662b4ba/distribute_setup.py' - -# parsing arguments -def normalize_to_url(option, opt_str, value, parser): - if value: - if '://' not in value: # It doesn't smell like a URL. - value = 'file://%s' % ( - urllib.pathname2url( - os.path.abspath(os.path.expanduser(value))),) - if opt_str == '--download-base' and not value.endswith('/'): - # Download base needs a trailing slash to make the world happy. - value += '/' - else: - value = None - name = opt_str[2:].replace('-', '_') - setattr(parser.values, name, value) - -usage = '''\ -[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options] - -Bootstraps a buildout-based project. - -Simply run this script in a directory containing a buildout.cfg, using the -Python that you want bin/buildout to use. - -Note that by using --setup-source and --download-base to point to -local resources, you can keep this script from going over the network. -''' - -parser = OptionParser(usage=usage) -parser.add_option("-v", "--version", dest="version", - help="use a specific zc.buildout version") -parser.add_option("-d", "--distribute", - action="store_true", dest="use_distribute", default=False, - help="Use Distribute rather than Setuptools.") -parser.add_option("--setup-source", action="callback", dest="setup_source", - callback=normalize_to_url, nargs=1, type="string", - help=("Specify a URL or file location for the setup file. " - "If you use Setuptools, this will default to " + - setuptools_source + "; if you use Distribute, this " - "will default to " + distribute_source + ".")) -parser.add_option("--download-base", action="callback", dest="download_base", - callback=normalize_to_url, nargs=1, type="string", - help=("Specify a URL or directory for downloading " - "zc.buildout and either Setuptools or Distribute. " - "Defaults to PyPI.")) -parser.add_option("--eggs", - help=("Specify a directory for storing eggs. Defaults to " - "a temporary directory that is deleted when the " - "bootstrap script completes.")) -parser.add_option("-t", "--accept-buildout-test-releases", - dest='accept_buildout_test_releases', - action="store_true", default=False, - help=("Normally, if you do not specify a --version, the " - "bootstrap script and buildout gets the newest " - "*final* versions of zc.buildout and its recipes and " - "extensions for you. If you use this flag, " - "bootstrap and buildout will get the newest releases " - "even if they are alphas or betas.")) -parser.add_option("-c", None, action="store", dest="config_file", - help=("Specify the path to the buildout configuration " - "file to be used.")) - -options, args = parser.parse_args() - -if options.eggs: - eggs_dir = os.path.abspath(os.path.expanduser(options.eggs)) -else: - eggs_dir = tempfile.mkdtemp() - -if options.setup_source is None: - if options.use_distribute: - options.setup_source = distribute_source - else: - options.setup_source = setuptools_source - -if options.accept_buildout_test_releases: - args.insert(0, 'buildout:accept-buildout-test-releases=true') - -try: - import pkg_resources - import setuptools # A flag. Sometimes pkg_resources is installed alone. - if not hasattr(pkg_resources, '_distribute'): - raise ImportError -except ImportError: - ez_code = urllib2.urlopen( - options.setup_source).read().replace('\r\n', '\n') - ez = {} - exec ez_code in ez - setup_args = dict(to_dir=eggs_dir, download_delay=0) - if options.download_base: - setup_args['download_base'] = options.download_base - if options.use_distribute: - setup_args['no_fake'] = True - if sys.version_info[:2] == (2, 4): - setup_args['version'] = '0.6.32' - ez['use_setuptools'](**setup_args) - if 'pkg_resources' in sys.modules: - reload(sys.modules['pkg_resources']) - import pkg_resources - # This does not (always?) update the default working set. We will - # do it. - for path in sys.path: - if path not in pkg_resources.working_set.entries: - pkg_resources.working_set.add_entry(path) - -cmd = [quote(sys.executable), - '-c', - quote('from setuptools.command.easy_install import main; main()'), - '-mqNxd', - quote(eggs_dir)] - -if not has_broken_dash_S: - cmd.insert(1, '-S') - -find_links = options.download_base -if not find_links: - find_links = os.environ.get('bootstrap-testing-find-links') -if not find_links and options.accept_buildout_test_releases: - find_links = 'http://downloads.buildout.org/' -if find_links: - cmd.extend(['-f', quote(find_links)]) - -if options.use_distribute: - setup_requirement = 'distribute' -else: - setup_requirement = 'setuptools' -ws = pkg_resources.working_set -setup_requirement_path = ws.find( - pkg_resources.Requirement.parse(setup_requirement)).location -env = dict( - os.environ, - PYTHONPATH=setup_requirement_path) - -requirement = 'zc.buildout' -version = options.version -if version is None and not options.accept_buildout_test_releases: - # Figure out the most recent final version of zc.buildout. - import setuptools.package_index - _final_parts = '*final-', '*final' - - def _final_version(parsed_version): - for part in parsed_version: - if (part[:1] == '*') and (part not in _final_parts): - return False - return True - index = setuptools.package_index.PackageIndex( - search_path=[setup_requirement_path]) - if find_links: - index.add_find_links((find_links,)) - req = pkg_resources.Requirement.parse(requirement) - if index.obtain(req) is not None: - best = [] - bestv = None - for dist in index[req.project_name]: - distv = dist.parsed_version - if distv >= pkg_resources.parse_version('2dev'): - continue - if _final_version(distv): - if bestv is None or distv > bestv: - best = [dist] - bestv = distv - elif distv == bestv: - best.append(dist) - if best: - best.sort() - version = best[-1].version - -if version: - requirement += '=='+version -else: - requirement += '<2dev' - -cmd.append(requirement) - -if is_jython: - import subprocess - exitcode = subprocess.Popen(cmd, env=env).wait() -else: # Windows prefers this, apparently; otherwise we would prefer subprocess - exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env])) -if exitcode != 0: - sys.stdout.flush() - sys.stderr.flush() - print ("An error occurred when trying to install zc.buildout. " - "Look above this message for any errors that " - "were output by easy_install.") - sys.exit(exitcode) - -ws.add_entry(eggs_dir) -ws.require(requirement) -import zc.buildout.buildout - -# If there isn't already a command in the args, add bootstrap -if not [a for a in args if '=' not in a]: - args.append('bootstrap') - - -# if -c was provided, we push it back into args for buildout's main function -if options.config_file is not None: - args[0:0] = ['-c', options.config_file] - -zc.buildout.buildout.main(args) -if not options.eggs: # clean up temporary egg directory - shutil.rmtree(eggs_dir) diff --git a/tests/integration/files/file/base/buildout/var/ver/2/bootrstrap/bootstrap.py b/tests/integration/files/file/base/buildout/var/ver/2/bootrstrap/bootstrap.py deleted file mode 100644 index 1b28969ae9..0000000000 --- a/tests/integration/files/file/base/buildout/var/ver/2/bootrstrap/bootstrap.py +++ /dev/null @@ -1,170 +0,0 @@ -############################################################################## -# -# Copyright (c) 2006 Zope Foundation and Contributors. -# All Rights Reserved. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE. -# -############################################################################## -"""Bootstrap a buildout-based project - -Simply run this script in a directory containing a buildout.cfg. -The script accepts buildout command-line options, so you can -use the -c option to specify an alternate configuration file. -""" - -import os -import shutil -import sys -import tempfile - -from optparse import OptionParser - -tmpeggs = tempfile.mkdtemp() - -usage = '''\ -[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options] - -Bootstraps a buildout-based project. - -Simply run this script in a directory containing a buildout.cfg, using the -Python that you want bin/buildout to use. - -Note that by using --find-links to point to local resources, you can keep -this script from going over the network. -''' - -parser = OptionParser(usage=usage) -parser.add_option("-v", "--version", help="use a specific zc.buildout version") - -parser.add_option("-t", "--accept-buildout-test-releases", - dest='accept_buildout_test_releases', - action="store_true", default=False, - help=("Normally, if you do not specify a --version, the " - "bootstrap script and buildout gets the newest " - "*final* versions of zc.buildout and its recipes and " - "extensions for you. If you use this flag, " - "bootstrap and buildout will get the newest releases " - "even if they are alphas or betas.")) -parser.add_option("-c", "--config-file", - help=("Specify the path to the buildout configuration " - "file to be used.")) -parser.add_option("-f", "--find-links", - help=("Specify a URL to search for buildout releases")) - - -options, args = parser.parse_args() - -###################################################################### -# load/install setuptools - -to_reload = False -try: - import pkg_resources - import setuptools -except ImportError: - ez = {} - - try: - from urllib.request import urlopen - except ImportError: - from urllib2 import urlopen - - # XXX use a more permanent ez_setup.py URL when available. - exec(urlopen('https://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py' - ).read(), ez) - setup_args = dict(to_dir=tmpeggs, download_delay=0) - ez['use_setuptools'](**setup_args) - - if to_reload: - reload(pkg_resources) - import pkg_resources - # This does not (always?) update the default working set. We will - # do it. - for path in sys.path: - if path not in pkg_resources.working_set.entries: - pkg_resources.working_set.add_entry(path) - -###################################################################### -# Install buildout - -ws = pkg_resources.working_set - -cmd = [sys.executable, '-c', - 'from setuptools.command.easy_install import main; main()', - '-mZqNxd', tmpeggs] - -find_links = os.environ.get( - 'bootstrap-testing-find-links', - options.find_links or - ('http://downloads.buildout.org/' - if options.accept_buildout_test_releases else None) - ) -if find_links: - cmd.extend(['-f', find_links]) - -setuptools_path = ws.find( - pkg_resources.Requirement.parse('setuptools')).location - -requirement = 'zc.buildout' -version = options.version -if version is None and not options.accept_buildout_test_releases: - # Figure out the most recent final version of zc.buildout. - import setuptools.package_index - _final_parts = '*final-', '*final' - - def _final_version(parsed_version): - for part in parsed_version: - if (part[:1] == '*') and (part not in _final_parts): - return False - return True - index = setuptools.package_index.PackageIndex( - search_path=[setuptools_path]) - if find_links: - index.add_find_links((find_links,)) - req = pkg_resources.Requirement.parse(requirement) - if index.obtain(req) is not None: - best = [] - bestv = None - for dist in index[req.project_name]: - distv = dist.parsed_version - if _final_version(distv): - if bestv is None or distv > bestv: - best = [dist] - bestv = distv - elif distv == bestv: - best.append(dist) - if best: - best.sort() - version = best[-1].version -if version: - requirement = '=='.join((requirement, version)) -cmd.append(requirement) - -import subprocess -if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0: - raise Exception( - "Failed to execute command:\n%s", - repr(cmd)[1:-1]) - -###################################################################### -# Import and run buildout - -ws.add_entry(tmpeggs) -ws.require(requirement) -import zc.buildout.buildout - -if not [a for a in args if '=' not in a]: - args.append('bootstrap') - -# if -c was provided, we push it back into args for buildout' main function -if options.config_file is not None: - args[0:0] = ['-c', options.config_file] - -zc.buildout.buildout.main(args) -shutil.rmtree(tmpeggs) diff --git a/tests/integration/files/file/base/buildout/var/ver/2/bootstrap/bootstrap.py b/tests/integration/files/file/base/buildout/var/ver/2/bootstrap/bootstrap.py new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/tests/integration/files/file/base/buildout/var/ver/2/bootstrap/bootstrap.py @@ -0,0 +1 @@ + diff --git a/tests/integration/files/file/base/buildout/var/ver/2/bootrstrap/buildout.cfg b/tests/integration/files/file/base/buildout/var/ver/2/bootstrap/buildout.cfg similarity index 100% rename from tests/integration/files/file/base/buildout/var/ver/2/bootrstrap/buildout.cfg rename to tests/integration/files/file/base/buildout/var/ver/2/bootstrap/buildout.cfg diff --git a/tests/unit/modules/zcbuildout_test.py b/tests/unit/modules/zcbuildout_test.py index 691d0a6064..7552077b48 100644 --- a/tests/unit/modules/zcbuildout_test.py +++ b/tests/unit/modules/zcbuildout_test.py @@ -3,6 +3,7 @@ # Import python libs import os import tempfile +import urllib2 import textwrap from distutils.dir_util import copy_tree @@ -34,15 +35,53 @@ buildout.__salt__ = { 'cmd.retcode': cmd.retcode, } +boot_init = { + 1: [ + 'var/ver/1/bootstrap/bootstrap.py', + ], + 2: [ + 'var/ver/2/bootstrap/bootstrap.py', + 'b/bootstrap.py', + ]} + + class Base(TestCase): + @classmethod + def setUpClass(cls): + cls.rdir = tempfile.mkdtemp() + cls.tdir = os.path.join(cls.rdir, 'test') + for i in buildout._url_versions: + p = os.path.join( + cls.rdir, '{}_bootstrap.py'.format(i) + ) + fic = open(p, 'w') + fic.write( + urllib2.urlopen(buildout._url_versions[i]).read()) + fic.close() + + @classmethod + def tearDownClass(cls): + if os.path.isdir(cls.rdir): + shutil.rmtree(cls.rdir) + def setUp(self): super(Base, self).setUp() - self.tdir = tempfile.mkdtemp() - copy_tree(ROOT, self.tdir) + self._remove_dir() + shutil.copytree(ROOT, self.tdir) + + for i in boot_init: + p = os.path.join( + self.rdir, '{}_bootstrap.py'.format(i) + ) + for f in boot_init[i]: + shutil.copy2(p, os.path.join(self.tdir, f)) def tearDown(self): super(Base, self).tearDown() + self._remove_dir() + + def _remove_dir(self): if os.path.isdir(self.tdir): shutil.rmtree(self.tdir) @@ -238,30 +277,31 @@ class BuildoutTestCase(Base): class BuildoutOnlineTestCase(Base): - def setUp(self): - super(BuildoutOnlineTestCase, self).setUp() - self.ppy_dis = os.path.join(self.tdir, 'pdistibute') - self.ppy_st = os.path.join(self.tdir, 'psetuptools') - self.ppy_blank = os.path.join(self.tdir, 'pblank') - self.py_dis = os.path.join(self.ppy_dis, 'bin', 'python') - self.py_st = os.path.join(self.ppy_st, 'bin', 'python') - self.py_blank = os.path.join(self.ppy_blank, 'bin', 'python') + @classmethod + def setUpClass(cls): + super(BuildoutOnlineTestCase, cls).setUpClass() + cls.ppy_dis = os.path.join(cls.rdir, 'pdistibute') + cls.ppy_st = os.path.join(cls.rdir, 'psetuptools') + cls.ppy_blank = os.path.join(cls.rdir, 'pblank') + cls.py_dis = os.path.join(cls.ppy_dis, 'bin', 'python') + cls.py_st = os.path.join(cls.ppy_st, 'bin', 'python') + cls.py_blank = os.path.join(cls.ppy_blank, 'bin', 'python') # creating a new setuptools install ret1 = buildout._Popen(( 'virtualenv --no-site-packages {0};' '{0}/bin/easy_install -U setuptools;' '{0}/bin/easy_install -U distribute;' - ).format(self.ppy_st)) + ).format(cls.ppy_st)) # creating a distribute based install ret2 = buildout._Popen(( 'virtualenv --no-site-packages {0};' '{0}/bin/easy_install -U setuptools==0.6c9;' '{0}/bin/easy_install -U distribute==0.6.43;' - ).format(self.ppy_dis)) + ).format(cls.ppy_dis)) # creating a blank based install ret3 = buildout._Popen(( 'virtualenv --no-site-packages --no-setuptools --no-pip {0}' - ''.format(self.ppy_blank))) + ''.format(cls.ppy_blank))) assert ret1['retcode'] == 0 assert ret2['retcode'] == 0 assert ret3['retcode'] == 0 diff --git a/tests/unit/states/zcbuildout_test.py b/tests/unit/states/zcbuildout_test.py index 3c3ca07c7e..6e6f666712 100644 --- a/tests/unit/states/zcbuildout_test.py +++ b/tests/unit/states/zcbuildout_test.py @@ -21,6 +21,7 @@ import integration import shutil # Import Salt libs +from unit.modules.zcbuildout_test import Base from salt.modules import zcbuildout as modbuildout from salt.states import zcbuildout as buildout from salt.modules import cmdmod as cmd @@ -48,18 +49,6 @@ buildout.__salt__ = { } -class Base(TestCase): - def setUp(self): - super(Base, self).setUp() - self.tdir = tempfile.mkdtemp() - copy_tree(ROOT, self.tdir) - - def tearDown(self): - super(Base, self).tearDown() - if os.path.isdir(self.tdir): - shutil.rmtree(self.tdir) - - class BuildoutTestCase(Base): @requires_network()