Merge pull request #59 from jwg4/master

Add an additional test to check inter-dependencies.

terrarium/terrarium.py

@@ -133,7 +133,7 @@ def requirements(self):
                         line = line.strip()
                         if line and not line.startswith('#'):
                             lines.append(line)
-        self._requirements = sorted(lines)
+        self._requirements = lines
         return self._requirements
 
     def restore_previously_backed_up_environment(self):

tests/fixtures/foo_requirement/setup.py

@@ -0,0 +1,18 @@
+from setuptools import setup
+
+setup_options = dict(
+    name='foo_requirement',
+    version='0.1.0dev',
+    author='Kyle Gibson',
+    author_email='kyle.gibson@frozenonline.com',
+    description='Another test requirement fixture',
+    license='BSD',
+    url='',
+    packages=['foo_requirement'],
+    long_description='',
+    install_requires=['test_requirement'],
+    classifiers=[],
+    zip_safe=False,
+)
+
+setup(**setup_options)

tests/tests.py

@@ -257,6 +257,25 @@ def test_install_with_requirement(self):
         expected = ['test_requirement']
         self.assertEqual(actual, expected)
 
+    def test_install_requirements_with_dependency(self):
+        """ This test involves a requirements file with two items,
+            test_requirement and foo_requirement. foo_requirement
+            has test_requirement as a dependency. We check that,
+            if test_requirement comes first in the requirements,
+            the install of foo_requirement will be successful.
+        """
+        self._add_requirements(
+            self._get_path('fixtures', 'test_requirement'),
+            self._get_path('fixtures', 'foo_requirement'),
+        )
+        self.assertInstall()
+        actual = self._can_import_requirements(
+            'test_requirement',
+            'foo_requirement',
+        )
+        expected = ['test_requirement', 'foo_requirement']
+        self.assertEqual(actual, expected)
+
     def test_install_with_requirement_comments(self):
         # Verify that a requirement file with comment lines can be used.
         self._add_requirements(