valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2014.7' into merge_forward_15

Browse Source
This commit is contained in:
rallytime 2015-02-11 08:48:14 -07:00
commit 533adca23a
1 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tests/integration/fileserver/gitfs_test.py
View File

@ -111,21 +111,6 @@ class GitFSTest(integration.ModuleCase):
ret = gitfs.file_list(LOAD)
self.assertIn('testfile', ret)
#@skipIf(True, 'Skipping tests temporarily')
def test_find_file(self):
with patch.dict(gitfs.__opts__, {'cachedir': self.master_opts['cachedir'],
'gitfs_remotes': ['file://' + self.tmp_repo_dir],
'sock_dir': self.master_opts['sock_dir']}):
path = os.path.join(self.master_opts['cachedir'],
'gitfs/refs',
LOAD['saltenv'],
'testfile')
ret = gitfs.find_file('testfile')
expected_ret = {'path': path, 'rel': 'testfile'}
self.assertDictEqual(ret, expected_ret)
#@skipIf(True, 'Skipping tests temporarily')
def test_dir_list(self):
with patch.dict(gitfs.__opts__, {'cachedir': self.master_opts['cachedir'],
@ -142,41 +127,6 @@ class GitFSTest(integration.ModuleCase):
ret = gitfs.envs()
self.assertIn('base', ret)
#@skipIf(True, 'Skipping tests temporarily')
def test_file_hash_sha1(self):
'''
NOTE: This test requires that gitfs.find_file is executed to ensure
that the file exists in the gitfs cache.
'''
target = 'testfile'
with patch.dict(gitfs.__opts__, {'cachedir': self.master_opts['cachedir'],
'gitfs_remotes': ['file://' + self.tmp_repo_dir],
'sock_dir': self.master_opts['sock_dir']}):
# This needs to be in its own patch because we are using a
# different hash_type for this test (sha1) from the one the master
# is using (md5), which will cause the find_file to fail when the
# repo URI is hashed to determine the cachedir.
gitfs.find_file(target)
with patch.dict(gitfs.__opts__, {'cachedir': self.master_opts['cachedir'],
'gitfs_remotes': ['file://' + self.tmp_repo_dir],
'sock_dir': self.master_opts['sock_dir'],
'hash_type': 'sha1'}):
tmp_load = copy.deepcopy(LOAD)
tmp_load['loc'] = 0
tmp_load['path'] = target
fnd = {'rel': target,
'path': os.path.join(gitfs.__opts__['cachedir'],
'gitfs/refs',
tmp_load['saltenv'],
tmp_load['path'])}
ret = gitfs.file_hash(tmp_load, fnd)
self.assertDictEqual(
{'hash_type': 'sha1',
'hsum': '6b18d04b61238ba13b5e4626b13ac5fb7432b5e2'},
ret)
#@skipIf(True, 'Skipping tests temporarily')
def test_serve_file(self):
'''