Merge pull request #2846 from mrtrumbe/dev/issue1236_movetests

Moved tests for InstallRequirement extras handling from test_req_file to test_req.

tests/unit/test_req.py

@@ -208,6 +208,42 @@ class TestInstallRequirement(object):
             assert req.markers == markers
             assert not req.match_markers()
 
+    def test_extras_for_line_path_requirement(self):
+        line = 'SomeProject[ex1,ex2]'
+        filename = 'filename'
+        comes_from = '-r %s (line %s)' % (filename, 1)
+        req = InstallRequirement.from_line(line, comes_from=comes_from)
+        assert len(req.extras) == 2
+        assert req.extras[0] == 'ex1'
+        assert req.extras[1] == 'ex2'
+
+    def test_extras_for_line_url_requirement(self):
+        line = 'git+https://url#egg=SomeProject[ex1,ex2]'
+        filename = 'filename'
+        comes_from = '-r %s (line %s)' % (filename, 1)
+        req = InstallRequirement.from_line(line, comes_from=comes_from)
+        assert len(req.extras) == 2
+        assert req.extras[0] == 'ex1'
+        assert req.extras[1] == 'ex2'
+
+    def test_extras_for_editable_path_requirement(self):
+        url = '.[ex1,ex2]'
+        filename = 'filename'
+        comes_from = '-r %s (line %s)' % (filename, 1)
+        req = InstallRequirement.from_editable(url, comes_from=comes_from)
+        assert len(req.extras) == 2
+        assert req.extras[0] == 'ex1'
+        assert req.extras[1] == 'ex2'
+
+    def test_extras_for_editable_url_requirement(self):
+        url = 'git+https://url#egg=SomeProject[ex1,ex2]'
+        filename = 'filename'
+        comes_from = '-r %s (line %s)' % (filename, 1)
+        req = InstallRequirement.from_editable(url, comes_from=comes_from)
+        assert len(req.extras) == 2
+        assert req.extras[0] == 'ex1'
+        assert req.extras[1] == 'ex2'
+
 
 def test_requirements_data_structure_keeps_order():
     requirements = Requirements()

tests/unit/test_req_file.py

@@ -265,42 +265,6 @@ class TestProcessLine(object):
         call = mock_parse.mock_calls[0]
         assert call[1][0] == 'http://me.com/me/reqs.txt'
 
-    def test_extras_for_line_path_requirement(self):
-        line = 'SomeProject[ex1,ex2]'
-        filename = 'filename'
-        comes_from = '-r %s (line %s)' % (filename, 1)
-        req = InstallRequirement.from_line(line, comes_from=comes_from)
-        assert len(req.extras) == 2
-        assert req.extras[0] == 'ex1'
-        assert req.extras[1] == 'ex2'
-
-    def test_extras_for_line_url_requirement(self):
-        line = 'git+https://url#egg=SomeProject[ex1,ex2]'
-        filename = 'filename'
-        comes_from = '-r %s (line %s)' % (filename, 1)
-        req = InstallRequirement.from_line(line, comes_from=comes_from)
-        assert len(req.extras) == 2
-        assert req.extras[0] == 'ex1'
-        assert req.extras[1] == 'ex2'
-
-    def test_extras_for_editable_path_requirement(self):
-        url = '.[ex1,ex2]'
-        filename = 'filename'
-        comes_from = '-r %s (line %s)' % (filename, 1)
-        req = InstallRequirement.from_editable(url, comes_from=comes_from)
-        assert len(req.extras) == 2
-        assert req.extras[0] == 'ex1'
-        assert req.extras[1] == 'ex2'
-
-    def test_extras_for_editable_url_requirement(self):
-        url = 'git+https://url#egg=SomeProject[ex1,ex2]'
-        filename = 'filename'
-        comes_from = '-r %s (line %s)' % (filename, 1)
-        req = InstallRequirement.from_editable(url, comes_from=comes_from)
-        assert len(req.extras) == 2
-        assert req.extras[0] == 'ex1'
-        assert req.extras[1] == 'ex2'
-
 
 class TestOptionVariants(object):