openstack/requirements
Code Issues Proposed changes

Merge "Stop adding extra newline after unparseable lines."

Browse Source
This commit is contained in:
Jenkins 2015-07-15 00:08:29 +00:00 committed by Gerrit Code Review
commit d859b7dcb3
2 changed files with 19 additions and 1 deletions
openstack_requirements
cmds
update.py
tests
test_update.py

2
openstack_requirements/cmds/update.py

@ -111,7 +111,7 @@ def _sync_requirements_file(
elif req is None:
# Unparsable lines.
output_requirements.append(
requirement.Requirement('', '', '', '', req_line))
requirement.Requirement('', '', '', '', req_line.rstrip()))
continue
elif not req.package:
# Comment-only lines

18
openstack_requirements/tests/test_update.py

@ -366,6 +366,24 @@ class TestSyncRequirementsFile(testtools.TestCase):
" foo>1;python_version!='2.7' -> \n"), actions[3])
self.assertThat(actions, matchers.HasLength(4))
def test_unparseable_line(self):
global_content = textwrap.dedent("""\
foo
""")
project_content = textwrap.dedent("""\
foo
-e git://git.openstack.org/openstack/neutron.git#egg=neutron
""")
global_reqs = requirement.parse(global_content)
project_reqs = list(requirement.to_reqs(project_content))
actions, reqs = update._sync_requirements_file(
global_reqs, project_reqs, 'f', False, False, False)
n = '-e git://git.openstack.org/openstack/neutron.git#egg=neutron'
self.assertEqual(requirement.Requirements([
requirement.Requirement('foo', '', '', '', ''),
requirement.Requirement('', '', '', '', n)]),
reqs)
class TestCopyRequires(testtools.TestCase):