Commit Graph

31 Commits

Author SHA1 Message Date
Erik Johnson
14cf6ce322 is_windows is a function, not a propery/attribute
While not fatal, this could potentially cause problems running this
test on Windows.
2017-07-17 23:36:21 -05:00
rallytime
95dbe1ade4 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
2016-09-14 09:15:29 -06:00
Pablo Suárez Hernández
a0bbb0f648 Integration tests fixes for 2016.3 (#36263)
* Fix PillarModuleTest::test_pillar_items: 'info' does not exist in pillar

* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
2016-09-13 12:40:56 -06:00
Mike Place
b9673b8b35 Str subst 2016-08-20 10:58:45 +09:00
Mike Place
ca045f4feb Fix git module test for py3
Simple binary compat fixes in version compare
2016-08-18 19:56:00 +09:00
twangboy
d0a96181e6 Clarify lowercase checking 2016-07-26 10:39:54 -07:00
twangboy
a5537ad6b9 Fix test_init, add lower 2016-07-25 16:11:36 -07:00
twangboy
e50ce384c0 Fix git integration tests for Windows 2016-07-25 15:45:11 -07:00
Erik Johnson
393015edbb Remove git.list_worktrees tests
These are being added back as unit tests.
2016-01-21 15:13:02 -06:00
Erik Johnson
519bdd6438 Fix integration tests for worktree addition in git >= 2.6
The output from 'git worktree add' changed slightly in 2.6.
2015-09-29 12:01:45 -05:00
Erik Johnson
22341b3139 Add debug logging
This is a massive test function with steps dependent on each other.
These log messages make it easier to look through the log file to
troubleshoot failures.
2015-09-02 20:58:06 -05:00
Erik Johnson
f033571d7e No shell needed when checking git version 2015-08-24 11:32:51 -05:00
Erik Johnson
398f779d92 Add debug logging to troubleshoot worktree test failures 2015-08-24 10:44:08 -05:00
Erik Johnson
b9b44a3434 Don't set global user.name or user.email if they already exist 2015-08-23 23:43:12 -05:00
Justin Findlay
2fee5708bb Merge pull request #26501 from terminalmage/git_pillar_docs
Update git_pillar docs, add git.list_worktrees function
2015-08-20 23:34:02 -06:00
Erik Johnson
43fef21907 Add list_worktrees tests 2015-08-19 19:09:59 -05:00
Jenkins
9149cfbeb2 Fixing more tarfile tests on py2.6 2015-08-19 14:12:18 -06:00
Mike Place
ed71476ca2 Merge pull request #26477 from cachedout/fix_26_tarfile
Fix integration.modules.git.GitModuleTest.test_archive on py26
2015-08-19 11:34:06 -06:00
Jenkins
dbbe206e19 Fix integration.modules.git.GitModuleTest.test_archive on py26
Fix borrowed from: http://stackoverflow.com/questions/6086603/statement-with-and-tarfile
2015-08-19 11:31:38 -06:00
justinta89
c542895bd2 --annotate and --message aren't valid options in older versions of git. 2015-08-19 09:09:34 -06:00
Erik Johnson
b7447fcadb Fix git.clone tests to reflect new return data 2015-08-18 03:39:27 -05:00
Erik Johnson
8dc8eb4b41 Fix test_add_dir
Paths in the expected output needed to be relative, not full
2015-08-18 02:40:25 -05:00
Erik Johnson
7c9f2027f6 Remove usage of os.chdir except in setUp
Additionally, take measures to ensure that we chdir back to the original
cwd at the conclusion of the test.

A redundant test has also been removed, was likely a stray copypasta.
2015-08-18 02:15:21 -05:00
Erik Johnson
dd9bcc896e Lint fixes 2015-08-17 22:10:39 -05:00
Erik Johnson
294aad298e Add proper tests for git execution module 2015-08-17 22:10:39 -05:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
rallytime
4e87557748 --local is not available in older versions of git
Also adjust the tests:
    subprocess.check_output is only available in python 2.7
2015-01-07 11:56:43 -07:00
Pedro Algarvio
a802d8f7f5 Use the skip_if_binaries_missing_helper 2014-11-20 16:40:38 +00:00
rallytime
e70537eb2c Fix missing cls variable and add some docstring info 2014-11-20 09:15:56 -07:00
Jonathan Ballet
a6c3499749 Please pylint
My patch #18221 yesterday introduced new Pylint warnings/errors.

This fixes these warnings.
2014-11-19 19:28:28 +01:00
Jonathan Ballet
38bb70d398 Fix Git's config set with values containing white spaces.
The Salt function 'git.config_set' and the state 'git.config' (which relies
on the former) don't escape the value to be set in the configuration file
passed by Salt. For example, this doesn't work:

  mylocalrepo:
    git.config:
      - name: user.name
      - value: "Jonathan Ballet"
      - repo: file://my/path/to/repo

This set the 'user.name' configuration value to "Jonathan" only.
(Additionally, the state discovers that the value set is not the one
specified, and keeps trying to set the right value, which ends up with lot
of "name = Jonathan" into the "[user]" section of Git's config file.)

This commit fixes the problem and adds some unit tests to verify it's
working properly.
2014-11-18 20:02:24 +01:00