Fix some of the erroring out test cases

There are a couple new test cases that are now erroring out.

- A usage of the non helper unit testcase base which is trigging
  and error on python 2.6 due to lack of method, fix this by using
  the base helper class.
- A freebsd distro test check thats looking for /etc/resolv.conf and
  examining its contents, which won't exist due to our mocking routine
  that does not allow that file to be read.
- A freebsd distro test where the distro class tries to call into 
  ['ifconfig', '-a'] for a set of values, those values don't exist on
  the machine I am running on (and likely others machines) so we should
  mock the subp function out (that the distro class calls) and correctly
  return values that will work for the testcase.

2 files changed, 8 insertions, 1 deletions

diff --git a/tests/unittests/test_datasource/test_openstack.py b/tests/unittests/test_datasource/test_openstack.py
index 7b4e651a..8becbdd2 100644
--- a/tests/unittests/test_datasource/test_openstack.py
+++ b/tests/unittests/test_datasource/test_openstack.py
@@ -318,7 +318,7 @@ class TestOpenStackDataSource(test_helpers.HttprettyTestCase):
         self.assertIsNone(ds_os.version)
 
 
-class TestVendorDataLoading(unittest.TestCase):
+class TestVendorDataLoading(test_helpers.TestCase):
     def cvj(self, data):
         return openstack.convert_vendordata_json(data)
 
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
index fbdb7b3f..35cc1f43 100644
--- a/tests/unittests/test_distros/test_netconfig.py
+++ b/tests/unittests/test_distros/test_netconfig.py
@@ -182,6 +182,12 @@ NETWORKING=yes
                                           spec=False, passthrough=False)
         load_mock = self.mocker.replace(util.load_file,
                                         spec=False, passthrough=False)
+        subp_mock = self.mocker.replace(util.subp,
+                                        spec=False, passthrough=False)
+
+        subp_mock(['ifconfig', '-a'])
+        self.mocker.count(0, None)
+        self.mocker.result(('vtnet0', ''))
 
         exists_mock(mocker.ARGS)
         self.mocker.count(0, None)
@@ -190,6 +196,7 @@ NETWORKING=yes
         write_bufs = {}
         read_bufs = {
             '/etc/rc.conf': '',
+            '/etc/resolv.conf': '',
         }
 
         def replace_write(filename, content, mode=0644, omode="wb"):