Fix up unit tests

Adds some dependencies, tweaks tox.ini to only include envs we care
about, and fixes an issue with the latest diskimage-builder where
it would fail if no operating-system element is included.

Change-Id: I6da9fb4f55978227b81c17a6d552b27ec2b90552

.gitignore

@@ -25,6 +25,7 @@ pip-log.txt
 # Unit test / coverage reports
 .coverage
 .tox
+.testrepository
 nosetests.xml
 
 # Translations

.testr.conf

@@ -0,0 +1,4 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./instack ./instack $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list

instack/tests/elements/os/element-provides

@@ -0,0 +1 @@
+operating-system

instack/tests/test_runner.py

@@ -32,7 +32,7 @@ class TestRunner(testtools.TestCase):
         test_elements = os.path.join(cwd, 'elements')
         self.element_paths = [test_elements]
 
-        self.runner = runner.ElementRunner(['dep2', 'echo'], [],
+        self.runner = runner.ElementRunner(['dep2', 'echo', 'os'], [],
                                            self.element_paths)
         tmp_dir = tempfile.mkdtemp()
         self.runner.tmp_hook_dir = tmp_dir
@@ -66,7 +66,7 @@ class TestRunner(testtools.TestCase):
         self.runner.copy_elements()
         self.runner.load_dependencies()
 
-        self.assertEqual(len(self.runner.elements), 3)
+        self.assertEqual(len(self.runner.elements), 4)
         self.assertTrue('dep1' in self.runner.elements)
 
     def test_process_exclude_elements(self):
@@ -76,7 +76,7 @@ class TestRunner(testtools.TestCase):
         self.runner.load_dependencies()
         self.runner.process_exclude_elements()
 
-        self.assertEqual(len(self.runner.elements), 2)
+        self.assertEqual(len(self.runner.elements), 3)
         self.assertFalse('dep1' in self.runner.elements)
 
     def test_process_path(self):
@@ -85,7 +85,7 @@ class TestRunner(testtools.TestCase):
         self.runner.loaded_elements = {}
         self.runner.process_path(test_elements)
 
-        self.assertEqual(len(self.runner.loaded_elements), 6)
+        self.assertEqual(len(self.runner.loaded_elements), 7)
         self.assertTrue('dep1' in self.runner.loaded_elements)
         self.assertTrue('dep2' in self.runner.loaded_elements)
         self.assertTrue('echo' in self.runner.loaded_elements)

requirements.txt

@@ -1,2 +1,3 @@
 pbr>=1.3,<2.0
 Babel>=0.9.6
+diskimage-builder

test-requirements.txt

@@ -9,3 +9,4 @@ oslo.sphinx
 testrepository>=0.0.17
 testscenarios>=0.4,<0.5
 testtools>=0.9.32
+mock>=1.0

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py26,py27,py33,pypy,pep8
+envlist = py34,py27,pep8
 skipsdist = True
 
 [testenv]