kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 21:30:10 +01:00
Code Activity

include modified and untracked files in status JSON

Browse Source 
Ideally, an fdroid repo should be running from a clean git repo, so that
all changes are tracked in git.  This change is useful in seeing which
changes and/or files are not in git.  If there are modified files, the
dirty flag will be set, so this info can help debugging that.
This commit is contained in:
Hans-Christoph Steiner 2020-11-17 13:50:28 +01:00
parent 384922118f
commit fb628c2cb2
2 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/common.py
View File

@ -746,6 +746,8 @@ def setup_status_output(start_timestamp):
output['fdroiddata'] = {
'commitId': get_head_commit_id(git_repo),
'isDirty': git_repo.is_dirty(),
'modifiedFiles': git_repo.git().ls_files(modified=True).split(),
'untrackedFiles': git_repo.untracked_files,
}
fdroidserver_dir = os.path.dirname(sys.argv[0])
if os.path.isdir(os.path.join(fdroidserver_dir, '.git')):
@ -753,6 +755,8 @@ def setup_status_output(start_timestamp):
output['fdroidserver'] = {
'commitId': get_head_commit_id(git_repo),
'isDirty': git_repo.is_dirty(),
'modifiedFiles': git_repo.git().ls_files(modified=True).split(),
'untrackedFiles': git_repo.untracked_files,
}
write_running_status_json(output)
return output

62
tests/common.TestCase
View File

@ -3,6 +3,7 @@
# http://www.drdobbs.com/testing/unit-testing-with-python/240165163
import difflib
import git
import glob
import inspect
import json
@ -1550,6 +1551,67 @@ class CommonTest(unittest.TestCase):
self.assertFalse(os.path.exists('config.py'))
fdroidserver.common.read_config(fdroidserver.common.options)
def test_setup_status_output(self):
testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
print(testdir)
os.chdir(testdir)
start_timestamp = time.gmtime()
subcommand = 'test'
fakecmd = ['fdroid ' + subcommand, '--option']
sys.argv = fakecmd
fdroidserver.common.config = dict()
fdroidserver.common.setup_status_output(start_timestamp)
with open(os.path.join('repo', 'status', 'running.json')) as fp:
data = json.load(fp)
self.assertFalse(os.path.exists('.git'))
self.assertFalse('fdroiddata' in data)
self.assertEqual(fakecmd, data['commandLine'])
self.assertEqual(subcommand, data['subcommand'])
def test_setup_status_output_in_git_repo(self):
testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
os.chdir(testdir)
logging.getLogger('git.cmd').setLevel(logging.INFO)
git_repo = git.Repo.init(testdir)
file_in_git = 'README.md'
with open(file_in_git, 'w') as fp:
fp.write('this is just a test')
git_repo.git.add(all=True)
git_repo.index.commit("update README")
start_timestamp = time.gmtime()
fakecmd = ['fdroid test2', '--option']
sys.argv = fakecmd
fdroidserver.common.config = dict()
fdroidserver.common.setup_status_output(start_timestamp)
with open(os.path.join('repo', 'status', 'running.json')) as fp:
data = json.load(fp)
self.assertTrue(os.path.exists('.git'))
self.assertIsNotNone(re.match(r'[0-9a-f]{40}', data['fdroiddata']['commitId']),
'Must be a valid git SHA1 commit ID!')
self.assertFalse(data['fdroiddata']['isDirty'])
self.assertEqual(fakecmd, data['commandLine'])
self.assertEqual([],
data['fdroiddata']['untrackedFiles'])
dirtyfile = 'dirtyfile'
with open(dirtyfile, 'w') as fp:
fp.write('this is just a test')
with open(file_in_git, 'a') as fp:
fp.write('\nappend some stuff')
self.assertEqual([],
data['fdroiddata']['modifiedFiles'])
fdroidserver.common.setup_status_output(start_timestamp)
with open(os.path.join('repo', 'status', 'running.json')) as fp:
data = json.load(fp)
self.assertTrue(data['fdroiddata']['isDirty'])
self.assertEqual([file_in_git],
data['fdroiddata']['modifiedFiles'])
self.assertEqual([dirtyfile, 'repo/status/running.json'],
data['fdroiddata']['untrackedFiles'])
if __name__ == "__main__":
os.chdir(os.path.dirname(__file__))