From 0891d9ad6e8070a51527a41a9d932d21571ee01f Mon Sep 17 00:00:00 2001 From: Carson Gee Date: Fri, 5 Sep 2014 15:46:44 -0400 Subject: [PATCH] Added git clean to git export feature This ensures that additional exports of the content are the same the first. --- .../contentstore/git_export_utils.py | 1 + .../contentstore/tests/test_export_git.py | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/cms/djangoapps/contentstore/git_export_utils.py b/cms/djangoapps/contentstore/git_export_utils.py index e15f6e02648a..2ee7eeb7ff98 100644 --- a/cms/djangoapps/contentstore/git_export_utils.py +++ b/cms/djangoapps/contentstore/git_export_utils.py @@ -111,6 +111,7 @@ def export_to_git(course_id, repo, user='', rdir=None): ['git', 'fetch', 'origin'], ['git', 'reset', '--hard', 'origin/{0}'.format(branch)], ['git', 'pull'], + ['git', 'clean', '-d', '-f'], ] else: cmds = [['git', 'clone', repo]] diff --git a/cms/djangoapps/contentstore/tests/test_export_git.py b/cms/djangoapps/contentstore/tests/test_export_git.py index 85a3d402364f..7054b6b439f8 100644 --- a/cms/djangoapps/contentstore/tests/test_export_git.py +++ b/cms/djangoapps/contentstore/tests/test_export_git.py @@ -113,3 +113,30 @@ def test_repo_with_dots(self): self.make_bare_repo_with_course('test.repo') response = self.client.get('{}?action=push'.format(self.test_url)) self.assertIn('Export Succeeded', response.content) + + def test_dirty_repo(self): + """ + Add additional items not in the repo and make sure they aren't + there after the export. This allows old content to removed + in the repo. + """ + repo_name = 'dirty_repo1' + self.make_bare_repo_with_course(repo_name) + git_export_utils.export_to_git(self.course.id, + self.course_module.giturl, self.user) + + # Make arbitrary change to course to make diff + self.course_module.matlab_api_key = 'something' + modulestore().update_item(self.course_module, self.user.id) + # Touch a file in the directory, export again, and make sure + # the test file is gone + repo_dir = os.path.join( + os.path.abspath(git_export_utils.GIT_REPO_EXPORT_DIR), + repo_name + ) + test_file = os.path.join(repo_dir, 'test.txt') + open(test_file, 'a').close() + self.assertTrue(os.path.isfile(test_file)) + git_export_utils.export_to_git(self.course.id, + self.course_module.giturl, self.user) + self.assertFalse(os.path.isfile(test_file))