Commit Graph

41 Commits

Author SHA1 Message Date
rallytime
cffbca44b6 Pylint fix - remove unused import 2015-02-11 09:35:04 -07:00
Mike Place
194ad0f8b1 Last time with find removed 2015-02-11 08:45:37 -07:00
jfindlay
a4572f34f3 Merge pull request #20578 from rallytime/bp-20561
Backport #20561 to 2014.7
2015-02-10 20:51:23 -07:00
Mike Place
c41998cc4f Remove another test. 2015-02-10 17:12:31 -07:00
Mike Place
836b525779 Disable gitfs test that does not produce valuable data 2015-02-10 17:11:04 -07:00
Pedro Algarvio
b32d86d0f4 Allow getting the configuration from scratch.
Properly handle `client_config` when loading from cache.
Only delete the `_client` attribute if it has been set.
2014-10-08 01:00:06 +01:00
Erik Johnson
ec07a8efea Get effective username using pwd.getpwduid() 2014-08-21 15:22:54 -05:00
Erik Johnson
43de873bb2 D'oh, needed to capitalize USERNAME 2014-08-21 14:35:36 -05:00
Erik Johnson
26a3db2ac8 Set USERNAME env var manually in test suite
This works around a known issue in GitPython when the USERNAME
environment variable is missing.
2014-08-21 12:19:31 -05:00
Erik Johnson
bf982d6893 Update gitfs test opts to reflect new gitfs config opts 2014-08-20 22:23:45 -05:00
Thomas S Hatch
da2f3543fd Skip gitfs tests
These are running in an incosistent way, all of our local tests pass
2014-07-11 15:17:58 -06:00
Erik Johnson
1fd16fa434 Refine gitfs tests
This adds a tearDown to ensure a clean copy of the repo for each test.
In addition, it removes the dependency on lexicographical order by
running a find_file() inside the two tests which require it in order to
ensure that the file exists in the gitfs cache.
2014-07-09 16:06:36 -06:00
Erik Johnson
d942c98ef6 Fix gitfs tests
This changes how the setUp function initializes and commits the repo
used as a gitfs remote by these tests. Instead of using the git.Git
class, it simply uses the index object to add and then commit. See here
for more info:

https://pythonhosted.org/GitPython/0.3.1/tutorial.html#the-index-object

Additionally, file_hash() and serve_file() are designed to check copies
of files that have been retrieved from the blobs, in
$cachedir/gitfs/refs/$saltenv/path/to/file. The paths have been fixed in
these two tests, and the sha1 test has been renamed to ensure that it is
executed after test_find_file, so that the file exists in the cache.
2014-07-08 18:56:12 -06:00
Mike Place
c4f5298d62 Create gitfs cache dir if does not exist
Should fix test suite
2014-06-17 12:04:53 -06:00
Mike Place
b278fcebff Use sha1 hash for gitfs tests 2014-06-16 16:16:57 -06:00
Pedro Algarvio
9e1634d386 Patch the gitfs opts with custom opts and not master opts.
It worked but this was, as it was, it's more explicit
2014-06-15 13:25:21 +01:00
Pedro Algarvio
0a10c4d2c7 Turns out all we needed was the correct load 2014-06-15 13:24:39 +01:00
Pedro Algarvio
79d7918271 Add missing path key to the load.
Minor PEP-8, global variable `load` -> `LOAD`
2014-06-15 13:18:36 +01:00
Pedro Algarvio
7b017fe9ab Skip test for now.
/CC: @cachedout
2014-06-15 13:05:19 +01:00
Pedro Algarvio
130788864f Skip tests on missing empty_dir 2014-06-15 13:05:19 +01:00
Pedro Algarvio
cf4a531e62 Fix ensure in syspath 2014-06-05 15:56:20 +01:00
Pedro Algarvio
81b93dc944 Skip tests which need the empty_dir.
These will run perfectly fine with the upcoming salt-runtests.
2014-06-05 11:54:07 +01:00
Pedro Algarvio
c3fbe4fe98 The cachedir configuration option needs to be set. 2014-06-05 11:10:24 +01:00
Pedro Algarvio
c8466453a0 Wrap text 2014-06-05 10:10:56 +01:00
Pedro Algarvio
ccbf2ebfb6 No hardcoded paths. Provide required additional configuration options. 2014-06-05 10:10:56 +01:00
Pedro Algarvio
649c7e6d01 Ensure proper path in syspath 2014-06-05 10:10:56 +01:00
Pedro Algarvio
36ea569d0d Don't use hard coded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
af503bfdcf Skip test if unable to import the git python package 2014-06-01 07:05:52 +01:00
David Boucha
9dc182a2f4 fix codeauthor misspellings 2014-05-21 18:59:02 -06:00
Mike Place
702d51f55e Remove unecessary test. 2014-04-09 16:27:44 -06:00
Pedro Algarvio
7465f0511f Remove unused import 2014-02-12 15:36:17 +00:00
Pedro Algarvio
c15526852a Remove unused imports 2014-02-12 15:35:14 +00:00
Pedro Algarvio
2a31e4e38b Remove unused imports & Skip if no mock available 2014-02-08 07:54:31 +00:00
Pedro Algarvio
6144ac22f7 Remove unused imports & Skip if no mock available 2014-02-08 07:51:28 +00:00
Pedro Algarvio
d67488775e Remove unused imports & Skip if no mock available 2014-02-08 07:50:12 +00:00
Mike Place
6c991e3216 Extreme-self-tab-lart 2013-12-12 11:31:11 -07:00
Mike Place
7405a4eaf3 Pylinting. 2013-12-12 10:16:45 -07:00
Mike Place
6027940a55 More gitfs integration testing. 2013-12-12 10:16:45 -07:00
Thomas S Hatch
7ee36fce89 pylint fixes 2013-12-11 13:07:36 -07:00
Mike Place
d59d8ecfd7 Fileserver integration testing.
Finished the roots integration tests for now. Started on GitFS testing.
2013-12-10 17:45:54 -07:00
Mike Place
55ecc5d0ab Starting work on new set of tests for fileclient.
Also, more integration testing for templates.
2013-12-09 16:47:49 -07:00