Skip to content

Commit 95e05c8

Browse files
committed
Fix line length
1 parent 15799c0 commit 95e05c8

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

test/framework/filetools.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,54 +2515,55 @@ def run_check():
25152515
'url': '[email protected]:easybuilders',
25162516
'tag': 'tag_for_tests',
25172517
}
2518+
git_repo = {'git_repo': '[email protected]:easybuilders/testrepository.git'} # Just to make the below shorter
25182519
expected = '\n'.join([
2519-
r' running command "git clone --depth 1 --branch refs/tags/tag_for_tests [email protected]:easybuilders/testrepository.git"',
2520+
r' running command "git clone --depth 1 --branch refs/tags/tag_for_tests %(git_repo)s"',
25202521
r" \(in .*/tmp.*\)",
25212522
r' running command "tar cfvz .*/target/test.tar.gz --exclude .git testrepository"',
25222523
r" \(in .*/tmp.*\)",
2523-
])
2524+
]) % git_repo
25242525
run_check()
25252526

25262527
git_config['recursive'] = True
25272528
expected = '\n'.join([
2528-
r' running command "git clone --depth 1 --branch refs/tags/tag_for_tests --recursive [email protected]:easybuilders/testrepository.git"',
2529+
r' running command "git clone --depth 1 --branch refs/tags/tag_for_tests --recursive %(git_repo)s"',
25292530
r" \(in .*/tmp.*\)",
25302531
r' running command "tar cfvz .*/target/test.tar.gz --exclude .git testrepository"',
25312532
r" \(in .*/tmp.*\)",
2532-
])
2533+
]) % git_repo
25332534
run_check()
25342535

25352536
git_config['keep_git_dir'] = True
25362537
expected = '\n'.join([
2537-
r' running command "git clone --branch refs/tags/tag_for_tests --recursive [email protected]:easybuilders/testrepository.git"',
2538+
r' running command "git clone --branch refs/tags/tag_for_tests --recursive %(git_repo)s"',
25382539
r" \(in .*/tmp.*\)",
25392540
r' running command "tar cfvz .*/target/test.tar.gz testrepository"',
25402541
r" \(in .*/tmp.*\)",
2541-
])
2542+
]) % git_repo
25422543
run_check()
25432544
del git_config['keep_git_dir']
25442545

25452546
del git_config['tag']
25462547
git_config['commit'] = '8456f86'
25472548
expected = '\n'.join([
2548-
r' running command "git clone --depth 1 --no-checkout [email protected]:easybuilders/testrepository.git"',
2549+
r' running command "git clone --depth 1 --no-checkout %(git_repo)s"',
25492550
r" \(in .*/tmp.*\)",
25502551
r' running command "git checkout 8456f86 && git submodule update --init --recursive"',
25512552
r" \(in testrepository\)",
25522553
r' running command "tar cfvz .*/target/test.tar.gz --exclude .git testrepository"',
25532554
r" \(in .*/tmp.*\)",
2554-
])
2555+
]) % git_repo
25552556
run_check()
25562557

25572558
del git_config['recursive']
25582559
expected = '\n'.join([
2559-
r' running command "git clone --depth 1 --no-checkout [email protected]:easybuilders/testrepository.git"',
2560+
r' running command "git clone --depth 1 --no-checkout %(git_repo)s"',
25602561
r" \(in .*/tmp.*\)",
25612562
r' running command "git checkout 8456f86"',
25622563
r" \(in testrepository\)",
25632564
r' running command "tar cfvz .*/target/test.tar.gz --exclude .git testrepository"',
25642565
r" \(in .*/tmp.*\)",
2565-
])
2566+
]) % git_repo
25662567
run_check()
25672568

25682569
# Test with real data
@@ -2631,7 +2632,6 @@ def run_check():
26312632
self.assertErrorRegex(EasyBuildError, error_pattern, ft.get_source_tarball_from_git, *args)
26322633
args[0] = 'test.tar.gz'
26332634

2634-
26352635
def test_is_sha256_checksum(self):
26362636
"""Test for is_sha256_checksum function."""
26372637
a_sha256_checksum = '44332000aa33b99ad1e00cbd1a7da769220d74647060a10e807b916d73ea27bc'

0 commit comments

Comments
 (0)