Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8

Conflicts:
    tests/unit/modules/boto_vpc_test.py

salt/states/pip_state.py

@@ -49,6 +49,13 @@ if HAS_PIP is True:
             del sys.modules['pip']
 # pylint: enable=import-error
 
+    ver = pip.__version__.split('.')
+    pip_ver = tuple([int(x) for x in ver if x.isdigit()])
+    if pip_ver >= (8, 0, 0):
+        from pip.exceptions import InstallationError
+    else:
+        InstallationError = ValueError
+
 logger = logging.getLogger(__name__)
 
 # Define the module's virtual name
@@ -135,7 +142,7 @@ def _check_pkg_version_format(pkg):
                         break
             else:
                 install_req = pip.req.InstallRequirement.from_line(pkg)
-    except ValueError as exc:
+    except (ValueError, InstallationError) as exc:
         ret['result'] = False
         if not from_vcs and '=' in pkg and '==' not in pkg:
             ret['comment'] = (

tests/integration/modules/pkg.py

@@ -51,14 +51,14 @@ class PkgModuleTest(integration.ModuleCase,
         '''
         func = 'pkg.mod_repo'
         os_grain = self.run_function('grains.item', ['os'])['os']
-        os_release = self.run_function('grains.item', ['osrelease'])['osrelease']
+        os_release_info = tuple(self.run_function('grains.item', ['osrelease_info'])['osrelease_info'])
 
-        if os_grain == 'Ubuntu':
+        if os_grain == 'Ubuntu' and os_release_info < (15, 10):
             repo = 'ppa:saltstack/salt'
             uri = 'http://ppa.launchpad.net/saltstack/salt/ubuntu'
             ret = self.run_function(func, [repo, 'comps=main'])
             self.assertNotEqual(ret, {})
-            if os_release.startswith('12.'):
+            if os_release_info[0] == 12:
                 self.assertIn(repo, ret)
             else:
                 self.assertIn(uri, ret.keys()[0])

tests/integration/states/pkgrepo.py

@@ -35,6 +35,14 @@ class PkgrepoTest(integration.ModuleCase,
         '''
         This is a destructive test as it adds a repository.
         '''
+        os_grain = self.run_function('grains.item', ['os'])['os']
+        os_release_info = tuple(self.run_function('grains.item', ['osrelease_info'])['osrelease_info'])
+        if os_grain == 'Ubuntu' and os_release_info >= (15, 10):
+            self.skipTest(
+                'The PPA used for this test does not exist for Ubuntu Wily'
+                ' (15.10) and later.'
+            )
+
         if grains['os_family'] == 'Debian':
             try:
                 from aptsources import sourceslist
@@ -57,6 +65,14 @@ class PkgrepoTest(integration.ModuleCase,
         This is a destructive test as it removes the repository added in the
         above test.
         '''
+        os_grain = self.run_function('grains.item', ['os'])['os']
+        os_release_info = tuple(self.run_function('grains.item', ['osrelease_info'])['osrelease_info'])
+        if os_grain == 'Ubuntu' and os_release_info >= (15, 10):
+            self.skipTest(
+                'The PPA used for this test does not exist for Ubuntu Wily'
+                ' (15.10) and later.'
+            )
+
         ret = self.run_function('state.sls', mods='pkgrepo.absent', timeout=120)
         # If the below assert fails then no states were run, and the SLS in
         # tests/integration/files/file/base/pkgrepo/absent.sls needs to be

tests/unit/pyobjects_test.py

@@ -347,6 +347,22 @@ class RendererTests(RendererMixin, StateTests):
         self.write_template_file("recursive_map.sls", recursive_map_template)
         render_and_assert(recursive_import_template)
 
+    def test_import_scope(self):
+        self.write_template_file("map.sls", map_template)
+        self.write_template_file("recursive_map.sls", recursive_map_template)
+
+        def do_render():
+            ret = self.render(scope_test_import_template,
+                              {'grains': {
+                                  'os_family': 'Debian',
+                                  'os': 'Debian'
+                              }})
+
+        self.assertRaises(NameError, do_render)
+
+        self.write_template_file("recursive_map.sls", recursive_map_template)
+        render_and_assert(recursive_import_template)
+
     def test_import_scope(self):
         self.write_template_file("map.sls", map_template)
         self.write_template_file("recursive_map.sls", recursive_map_template)