From 19686d549ca13140ff390418e80853b04f477185 Mon Sep 17 00:00:00 2001 From: Dane Summers Date: Wed, 15 Aug 2012 09:04:17 -0400 Subject: [PATCH 1/6] support for subversion repositories --- library/subversion | 146 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 library/subversion diff --git a/library/subversion b/library/subversion new file mode 100644 index 00000000000..3a2456f757c --- /dev/null +++ b/library/subversion @@ -0,0 +1,146 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +# (c) 2012, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + +# I wanted to keep this simple at first, so for now this checks out +# from the given branch of a repo at a particular SHA or +# tag. Latest is not supported, you should not be doing +# that. Contribs welcome! -- MPD + +# requires subversion on the client. + +import re +import logging +logger = logging.getLogger('subversion') +#hdlr = logging.FileHandler('/tmp/subversion.log') +#hdlr.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s')) +#logger.addHandler(hdlr) +logger.setLevel(logging.DEBUG) + +def get_version(dest): + ''' samples the version of the git repo ''' + logger.debug('get_version') + os.chdir(dest) + cmd = "svn info | grep Revision" + logger.debug(cmd) + return os.popen(cmd).read() + +def checkout(repo, dest): + ''' makes a new svn repo if it does not already exist ''' + logger.debug('checkout') + try: + os.makedirs(os.path.dirname(dest)) + except: + pass + cmd = "svn co %s %s" % (repo, dest) + logger.debug(cmd) + cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (out, err) = cmd.communicate() + rc = cmd.returncode + logger.debug('rc, error: %s, %s ' % (rc,err)) + return (rc, out, err) + +def reset(dest): + ''' + throw away any changes? + TODO doesn't seem like a good idea to me... + TODO throw away non-tracked files? + -- svn st | grep '?' | awk '{print $2}' | xargs rm -rf + ''' + logger.debug('reset') + os.chdir(dest) + cmd = "svn revert -R ." + logger.debug(cmd) + cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (out, err) = cmd.communicate() + rc = cmd.returncode + return (rc, out, err) + +def update(module, dest, version): + ''' update an existing svn repo ''' + logger.debug('update') + os.chdir(dest) + cmd = '' + if version != 'HEAD': + cmd = "svn up -r %s" % version + else: + cmd = "svn up" + logger.debug(cmd) + cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (out, err) = cmd.communicate() + rc = cmd.returncode + return (rc, out, err) + +# =========================================== + +def main(): + module = AnsibleModule( + argument_spec = dict( + dest=dict(required=True), + repo=dict(required=True, aliases=['name']), + revision=dict(default='HEAD') + ) + ) + + dest = module.params['dest'] + repo = module.params['repo'] + revision = module.params['revision'] + + rc, out, err, status = (0, None, None, None) + + # if there is no .svn folder, do a checkout + # else update. + before = None + if not os.path.exists("%s/.svn" % (dest)): + logger.debug('.svn exists') + (rc, out, err) = checkout(repo, dest) + if rc != 0: + logger.debug('checkout failure') + module.fail_json(msg=err) + else: + # else do an update + before = get_version(dest) + (rc, out, err) = reset(dest) + if rc != 0: + module.fail_json(msg=err) + + # handle errors from checkout or pull + logger.debug('ERROR: %s' % (err.find('ERROR') != -1)) + if err.find('ERROR') != -1: + logger.debug('err:\n%s' % (err)) + module.fail_json(msg=err) + + # switch to version specified regardless of whether + # we cloned or pulled + (rc, out, err) = update(module, dest, revision) + if rc != 0: + module.fail_json(msg=err) + + # determine if we changed anything + after = get_version(dest) + changed = False + + if before != after: + changed = True + + module.exit_json(changed=changed, before=before, after=after, msg="fell thru the bag") + +# include magic from lib/ansible/module_common.py +#<> +main() From 157fa3868a04b6273bad83795b42acb5e65ed7b7 Mon Sep 17 00:00:00 2001 From: Dane Summers Date: Tue, 21 Aug 2012 13:59:39 -0400 Subject: [PATCH 2/6] added TODO for test scenarios to add --- library/subversion | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/library/subversion b/library/subversion index 3a2456f757c..5489089573a 100644 --- a/library/subversion +++ b/library/subversion @@ -33,6 +33,21 @@ logger = logging.getLogger('subversion') #logger.addHandler(hdlr) logger.setLevel(logging.DEBUG) +# TODO test scenarios: +# hacking/test-module -m library/subversion ; cat /tmp/subversion.log +# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\"" ; cat /tmp/subversion.log +# hacking/test-module -m library/subversion -a "dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log +# when /tmp/gnconf doesn't exist: +# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\" dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log +# when /tmp/gnconf is a folder, but its not an svn repo +# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\" dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log +# when /tmp/gnconf is a folder, but its a file (not a folder) +# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\" dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log +# when /tmp/gnconf is a folder, when its a different svn URL +# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\" dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log +# when /tmp/gnconf is a folder, when its a different revision +# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\" dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log + def get_version(dest): ''' samples the version of the git repo ''' logger.debug('get_version') From 24c8c22e754cd78af1aff57e441960ae091dafc5 Mon Sep 17 00:00:00 2001 From: Dane Summers Date: Tue, 21 Aug 2012 16:10:17 -0400 Subject: [PATCH 3/6] removed logger, removed superfluous mkdir --- library/subversion | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/library/subversion b/library/subversion index 5489089573a..59292d5f789 100644 --- a/library/subversion +++ b/library/subversion @@ -26,12 +26,6 @@ # requires subversion on the client. import re -import logging -logger = logging.getLogger('subversion') -#hdlr = logging.FileHandler('/tmp/subversion.log') -#hdlr.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s')) -#logger.addHandler(hdlr) -logger.setLevel(logging.DEBUG) # TODO test scenarios: # hacking/test-module -m library/subversion ; cat /tmp/subversion.log @@ -50,25 +44,16 @@ logger.setLevel(logging.DEBUG) def get_version(dest): ''' samples the version of the git repo ''' - logger.debug('get_version') os.chdir(dest) cmd = "svn info | grep Revision" - logger.debug(cmd) return os.popen(cmd).read() def checkout(repo, dest): ''' makes a new svn repo if it does not already exist ''' - logger.debug('checkout') - try: - os.makedirs(os.path.dirname(dest)) - except: - pass cmd = "svn co %s %s" % (repo, dest) - logger.debug(cmd) cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (out, err) = cmd.communicate() rc = cmd.returncode - logger.debug('rc, error: %s, %s ' % (rc,err)) return (rc, out, err) def reset(dest): @@ -78,10 +63,8 @@ def reset(dest): TODO throw away non-tracked files? -- svn st | grep '?' | awk '{print $2}' | xargs rm -rf ''' - logger.debug('reset') os.chdir(dest) cmd = "svn revert -R ." - logger.debug(cmd) cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (out, err) = cmd.communicate() rc = cmd.returncode @@ -89,14 +72,12 @@ def reset(dest): def update(module, dest, version): ''' update an existing svn repo ''' - logger.debug('update') os.chdir(dest) cmd = '' if version != 'HEAD': cmd = "svn up -r %s" % version else: cmd = "svn up" - logger.debug(cmd) cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (out, err) = cmd.communicate() rc = cmd.returncode @@ -123,10 +104,8 @@ def main(): # else update. before = None if not os.path.exists("%s/.svn" % (dest)): - logger.debug('.svn exists') (rc, out, err) = checkout(repo, dest) if rc != 0: - logger.debug('checkout failure') module.fail_json(msg=err) else: # else do an update @@ -136,9 +115,7 @@ def main(): module.fail_json(msg=err) # handle errors from checkout or pull - logger.debug('ERROR: %s' % (err.find('ERROR') != -1)) if err.find('ERROR') != -1: - logger.debug('err:\n%s' % (err)) module.fail_json(msg=err) # switch to version specified regardless of whether @@ -154,7 +131,7 @@ def main(): if before != after: changed = True - module.exit_json(changed=changed, before=before, after=after, msg="fell thru the bag") + module.exit_json(changed=changed, before=before, after=after, msg="") # include magic from lib/ansible/module_common.py #<> From 6dd6a4c534f428ae0d1c571048a5f61cf157f42d Mon Sep 17 00:00:00 2001 From: Dane Summers Date: Wed, 22 Aug 2012 23:06:03 -0400 Subject: [PATCH 4/6] tested library - fixed several test cases, added 'force' option, and removed grep requirement --- library/subversion | 89 +++++++++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/library/subversion b/library/subversion index 59292d5f789..8dd2e3160eb 100644 --- a/library/subversion +++ b/library/subversion @@ -23,30 +23,17 @@ # tag. Latest is not supported, you should not be doing # that. Contribs welcome! -- MPD -# requires subversion on the client. +# requires subversion and grep on the client. import re -# TODO test scenarios: -# hacking/test-module -m library/subversion ; cat /tmp/subversion.log -# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\"" ; cat /tmp/subversion.log -# hacking/test-module -m library/subversion -a "dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log -# when /tmp/gnconf doesn't exist: -# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\" dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log -# when /tmp/gnconf is a folder, but its not an svn repo -# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\" dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log -# when /tmp/gnconf is a folder, but its a file (not a folder) -# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\" dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log -# when /tmp/gnconf is a folder, when its a different svn URL -# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\" dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log -# when /tmp/gnconf is a folder, when its a different revision -# hacking/test-module -m library/subversion -a "repo=\"svn+ssh://pen.syskey.com/opt/subversion/gnconf\" dest=\"/tmp/gnconf\"" ; cat /tmp/subversion.log - def get_version(dest): ''' samples the version of the git repo ''' os.chdir(dest) - cmd = "svn info | grep Revision" - return os.popen(cmd).read() + cmd = "svn info" + revision = filter(lambda l: re.search('Revision',l) != None,os.popen(cmd).read().splitlines()) + url = filter(lambda l: re.search('^URL',l) != None,os.popen(cmd).read().splitlines()) + return [revision[0],url[0]] def checkout(repo, dest): ''' makes a new svn repo if it does not already exist ''' @@ -56,20 +43,38 @@ def checkout(repo, dest): rc = cmd.returncode return (rc, out, err) -def reset(dest): - ''' - throw away any changes? - TODO doesn't seem like a good idea to me... - TODO throw away non-tracked files? - -- svn st | grep '?' | awk '{print $2}' | xargs rm -rf - ''' - os.chdir(dest) - cmd = "svn revert -R ." +def switch(repo, dest): + ''' makes a new svn repo if it does not already exist ''' + cmd = "svn sw %s %s" % (repo, dest) cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (out, err) = cmd.communicate() rc = cmd.returncode return (rc, out, err) +def has_local_mods(dest): + os.chdir(dest) + cmd = "svn status" + words = os.popen(cmd).read() + splitup = words.splitlines() + filtered = filter(lambda c: re.search('^\\?.*$',c) == None,splitup) + return len(filtered) > 0 + +def reset(dest,force): + ''' + Reset the repo: + force: if true, then remove any local modifications. Else, fail if there are local modifications + ''' + if has_local_mods(dest): + if force: + cmd = "svn revert -R ." + cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (out, err) = cmd.communicate() + rc = cmd.returncode + return (rc, out, err) + else: + return (-1,"ERROR: modified files exist in the repository.","") + return (0,"","") + def update(module, dest, version): ''' update an existing svn repo ''' os.chdir(dest) @@ -90,31 +95,41 @@ def main(): argument_spec = dict( dest=dict(required=True), repo=dict(required=True, aliases=['name']), - revision=dict(default='HEAD') + revision=dict(default='HEAD'), + force=dict(default='no', choices=['yes', 'no'], aliases=['force']) ) ) - dest = module.params['dest'] - repo = module.params['repo'] + dest = module.params['dest'] + repo = module.params['repo'] revision = module.params['revision'] + force = module.boolean(module.params['force']) rc, out, err, status = (0, None, None, None) # if there is no .svn folder, do a checkout # else update. before = None + local_mods = False if not os.path.exists("%s/.svn" % (dest)): - (rc, out, err) = checkout(repo, dest) - if rc != 0: - module.fail_json(msg=err) + if os.path.exists(dest): + module.fail_json(msg="%s folder already exists, but its not a subversion repository." % (dest)) + else: + (rc, out, err) = checkout(repo, dest) + if rc != 0: + module.fail_json(msg=err) else: + local_mods = has_local_mods(dest) # else do an update before = get_version(dest) - (rc, out, err) = reset(dest) + (rc, out, err) = reset(dest,force) + if rc != 0: + module.fail_json(msg=err) + (rc, out, err) = switch(repo, dest) if rc != 0: module.fail_json(msg=err) - # handle errors from checkout or pull + # handle errors from switch or pull if err.find('ERROR') != -1: module.fail_json(msg=err) @@ -128,10 +143,10 @@ def main(): after = get_version(dest) changed = False - if before != after: + if before != after or local_mods: changed = True - module.exit_json(changed=changed, before=before, after=after, msg="") + module.exit_json(changed=changed, before=before, after=after) # include magic from lib/ansible/module_common.py #<> From 71cff252549f600b614b2ddcbb1dfe577e4bf7f2 Mon Sep 17 00:00:00 2001 From: Dane Summers Date: Thu, 23 Aug 2012 00:07:14 -0400 Subject: [PATCH 5/6] added force option to git - made both subversion and git default to force=true for backward compatibility with git's previous behavior --- library/git | 22 ++++++++++++++++++---- library/subversion | 7 +++---- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/library/git b/library/git index cc8f7e41a24..1bb5c94b0da 100755 --- a/library/git +++ b/library/git @@ -45,13 +45,23 @@ def clone(repo, dest): rc = cmd.returncode return (rc, out, err) -def reset(dest): + +def has_local_mods(dest): + os.chdir(dest) + cmd = "git status -s" + lines = os.popen(cmd).read().splitlines() + lines = filter(lambda c: re.search('^\\?\\?.*$',c) == None,lines) + return len(lines) > 0 + +def reset(module,dest,force): ''' Resets the index and working tree to HEAD. Discards any changes to tracked files in working tree since that commit. ''' os.chdir(dest) + if not force and has_local_mods(dest): + module.fail_json(msg="Local modifications exist in repository (force=no).") cmd = "git reset --hard HEAD" cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (out, err) = cmd.communicate() @@ -140,7 +150,8 @@ def main(): dest=dict(required=True), repo=dict(required=True, aliases=['name']), version=dict(default='HEAD'), - remote=dict(default='origin') + remote=dict(default='origin'), + force=dict(default='yes', choices=['yes', 'no'], aliases=['force']) ) ) @@ -148,6 +159,7 @@ def main(): repo = module.params['repo'] version = module.params['version'] remote = module.params['remote'] + force = module.boolean(module.params['force']) gitconfig = os.path.join(dest, '.git', 'config') @@ -156,14 +168,16 @@ def main(): # if there is no git configuration, do a clone operation # else pull and switch the version before = None + local_mods = False if not os.path.exists(gitconfig): (rc, out, err) = clone(repo, dest) if rc != 0: module.fail_json(msg=err) else: # else do a pull + local_mods = has_local_mods(dest) before = get_version(dest) - (rc, out, err) = reset(dest) + (rc, out, err) = reset(module,dest,force) if rc != 0: module.fail_json(msg=err) (rc, out, err) = pull(module, repo, dest, version) @@ -182,7 +196,7 @@ def main(): after = get_version(dest) changed = False - if before != after: + if before != after or local_mods: changed = True module.exit_json(changed=changed, before=before, after=after) diff --git a/library/subversion b/library/subversion index 8dd2e3160eb..c8782216f54 100644 --- a/library/subversion +++ b/library/subversion @@ -54,9 +54,8 @@ def switch(repo, dest): def has_local_mods(dest): os.chdir(dest) cmd = "svn status" - words = os.popen(cmd).read() - splitup = words.splitlines() - filtered = filter(lambda c: re.search('^\\?.*$',c) == None,splitup) + lines = os.popen(cmd).read().splitlines() + filtered = filter(lambda c: re.search('^\\?.*$',c) == None,lines) return len(filtered) > 0 def reset(dest,force): @@ -96,7 +95,7 @@ def main(): dest=dict(required=True), repo=dict(required=True, aliases=['name']), revision=dict(default='HEAD'), - force=dict(default='no', choices=['yes', 'no'], aliases=['force']) + force=dict(default='yes', choices=['yes', 'no'], aliases=['force']) ) ) From eb49ee38aeb84536daa89248edb4f3dfb7e49e7b Mon Sep 17 00:00:00 2001 From: Dane Summers Date: Thu, 23 Aug 2012 00:08:38 -0400 Subject: [PATCH 6/6] full test case for subversion, minimal tests for git --- test/TestRunner.py | 81 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/test/TestRunner.py b/test/TestRunner.py index 16c962ad70f..17dcf5b9fc0 100644 --- a/test/TestRunner.py +++ b/test/TestRunner.py @@ -138,6 +138,85 @@ class TestRunner(unittest.TestCase): assert 'failed' not in result assert result['rc'] == 0 + def test_git(self): + self._run('file',['path=/tmp/gitdemo','state=absent']) + self._run('file',['path=/tmp/gd','state=absent']) + self._run('command',['git init gitdemo', 'chdir=/tmp']) + self._run('command',['touch a', 'chdir=/tmp/gitdemo']) + self._run('command',['git add *', 'chdir=/tmp/gitdemo']) + self._run('command',['git commit -m "test commit 2"', 'chdir=/tmp/gitdemo']) + self._run('command',['touch b', 'chdir=/tmp/gitdemo']) + self._run('command',['git add *', 'chdir=/tmp/gitdemo']) + self._run('command',['git commit -m "test commit 2"', 'chdir=/tmp/gitdemo']) + result = self._run('git', [ "repo=\"file:///tmp/gitdemo\"", "dest=/tmp/gd" ]) + assert result['changed'] + # test the force option not set + self._run('file',['path=/tmp/gd/a','state=absent']) + result = self._run('git', [ "repo=\"file:///tmp/gitdemo\"", "dest=/tmp/gd", "force=no" ]) + assert result['failed'] + # test the force option when set + result = self._run('git', [ "repo=\"file:///tmp/gitdemo\"", "dest=/tmp/gd", "force=yes" ]) + assert result['changed'] + + def test_subversion(self): + # TODO make an svn repo locally so as to avoid tests failing on network calls + self._run('file',['path=/tmp/meetings','state=absent']) + # hacking/test-module -m library/subversion + result = self._run('subversion', [ ]) + assert result['failed'] + assert "dest" in result['msg'] + assert "repo" in result['msg'] + # hacking/test-module -m library/subversion -a "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings\"" + result = self._run('subversion', [ "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings\"" ]) + assert result['failed'] + assert "dest" in result['msg'] + # hacking/test-module -m library/subversion -a "dest=\"/tmp/gnconf\"" + result = self._run('subversion', [ "dest=\"/tmp/gnconf\"" ]) + assert result['failed'] + assert "repo" in result['msg'] + # when /tmp/meetings doesn't exist: + # hacking/test-module -m library/subversion -a "repo=\"repo\" dest=\"/tmp/gnconf\"" + result = self._run('subversion', [ "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings\"","dest=\"/tmp/meetings\"" ]) + assert result['changed'] + # when /tmp/meetings exists, but nothing has changed. + result = self._run('subversion', [ "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings\"","dest=\"/tmp/meetings\"" ]) + assert not result['changed'] + # when /tmp/meetings is a folder, but its not an svn repo + self._run('file',['path=/tmp/meetings','state=absent']) + self._run('file',['path=/tmp/meetings','state=directory']) + result = self._run('subversion', [ "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings\"","dest=\"/tmp/meetings\"" ]) + assert result['failed'] + # when /tmp/meetings is a file + self._run('file',['path=/tmp/meetings','state=absent']) + self._run('command',['touch /tmp/meetings']) + result = self._run('subversion', [ "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings\"","dest=\"/tmp/meetings\"" ]) + assert result['failed'] + # when /tmp/meetings is a folder, but its a different svn URL - should automatically switch + self._run('file',['path=/tmp/meetings','state=absent']) + result = self._run('subversion', [ "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/api-errata\"","dest=\"/tmp/meetings\"" ]) + assert result['changed'] + result = self._run('subversion', [ "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings\"","dest=\"/tmp/meetings\"" ]) + assert result['changed'] + assert result['after'][1] == 'URL: http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings' + # when /tmp/meetings is a folder, when its an older revision it should update + self._run('command',['svn up -r926415','chdir=/tmp/meetings']) + result = self._run('subversion', [ "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings\"","dest=\"/tmp/meetings\"" ]) + assert result['changed'] + assert result['before'][0] == 'Revision: 926415' + assert result['after'][0] != 'Revision: 926415' + # when /tmp/meetings has dirty files in it, ignore them: + self._run('command',['touch /tmp/meetings/adirtyfile']) + result = self._run('subversion', [ "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings\"","dest=\"/tmp/meetings\"" ]) + assert not result['changed'] # no changes to the repo + # when /tmp/meetings has modified file in it, fail: + self._run('file',['path=/tmp/meetings/adirtyfile','state=absent']) + self._run('command',['cp /tmp/meetings/berlin-11-agenda /tmp/meetings/svn-vision-agenda']) + result = self._run('subversion', [ "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings\"","dest=\"/tmp/meetings\"","force=no" ]) + assert result['failed'] + # when /tmp/meetings has a modified file but force is set to yes, then just override it. + result = self._run('subversion', [ "repo=\"http://svn.apache.org/repos/asf/subversion/trunk/notes/meetings\"","dest=\"/tmp/meetings\"","force=yes" ]) + assert result['changed'] # no changes to the repo + def test_large_output(self): large_path = "/usr/share/dict/words" if not os.path.exists(large_path): @@ -198,5 +277,3 @@ class TestRunner(unittest.TestCase): "dest=%s" % output, ]) assert result['changed'] == False - -