Merge branch 'develop' of github.com:saltstack/salt into develop

salt/modules/file.py

@@ -198,12 +198,12 @@ def chown(path, user, group):
     gid = group_to_gid(group)
     err = ''
     if uid == '':
-        if user != '':
+        if not user:
             err += 'User does not exist\n'
         else:
             uid = -1
     if gid == '':
-        if group != '':
+        if not group:
             err += 'Group does not exist\n'
         else:
             gid = -1

tests/integration/modules/virtualenv.py

@@ -0,0 +1,73 @@
+# Import python libs
+import sys
+import os
+import tempfile
+
+# Import salt libs
+from saltunittest import TestLoader, TextTestRunner
+import integration
+from integration import TestDaemon
+
+
+class VirtualenvModuleTest(integration.ModuleCase):
+    '''
+    Validate the pip module
+    '''
+    def setUp(self):
+        super(VirtualenvModuleTest, self).setUp()
+        ret = self.run_function('cmd.has_exec', ['virtualenv'])
+        if not ret:
+            self.skipTest("virtualenv not installed")
+        self.venv_test_dir = tempfile.mkdtemp()
+        self.client.cmd('minion',
+                        'cmd.run',
+                        ['mkdir -p {0}'.format(self.venv_test_dir)])
+        self.venv_dir = os.path.join(self.venv_test_dir, 'venv')
+
+    def test_create_defaults(self):
+        '''
+        virtualenv.managed
+        '''
+        self.run_function('virtualenv.create', [self.venv_dir])
+        pip_file = os.path.join(self.venv_dir, 'bin', 'pip')
+        self.assertTrue(os.path.exists(pip_file))
+
+    def test_site_packages(self):
+        pip_bin = os.path.join(self.venv_dir, 'bin', 'pip')
+        self.run_function('virtualenv.create',
+                          [self.venv_dir],
+                          system_site_packages=True)
+        with_site = self.run_function('pip.freeze', bin_env=pip_bin)
+        self.client.cmd('minion',
+                        'cmd.run',
+                        ['rm -r {0}'.format(self.venv_dir)])
+        self.run_function('virtualenv.create',
+                          [self.venv_dir])
+        without_site = self.run_function('pip.freeze', bin_env=pip_bin)
+        self.assertFalse(with_site == without_site)
+
+    def test_clear(self):
+        pip_bin = os.path.join(self.venv_dir, 'bin', 'pip')
+        self.run_function('virtualenv.create',
+                          [self.venv_dir])
+        self.run_function('pip.install', [], pkgs='pep8', bin_env=pip_bin)
+        self.run_function('virtualenv.create',
+                          [self.venv_dir],
+                          clear=True)
+        packages = self.run_function('pip.list',
+                                     prefix='pep8',
+                                     bin_env=pip_bin)
+        self.assertFalse('pep8' in packages)
+
+    def tearDown(self):
+        self.client.cmd('minion',
+                        'cmd.run',
+                        ['rm -r {0}'.format(self.venv_test_dir)])
+
+if __name__ == "__main__":
+    loader = TestLoader()
+    tests = loader.loadTestsFromTestCase(VirtualenvModuleTest)
+    print('Setting up Salt daemons to execute tests')
+    with TestDaemon():
+        runner = TextTestRunner(verbosity=1).run(tests)
+        sys.exit(runner.wasSuccessful())