diff options
| author | David Lehman <dlehman@redhat.com> | 2013-01-08 18:30:39 -0600 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2013-01-28 13:15:04 -0600 |
| commit | ea9f0d7cfee26140f6244899b48ae2125688bbba (patch) | |
| tree | 6f58cd9251d7aff2ff042fa51111847d9b72416c /tests/pyanaconda_test | |
| parent | e6522ec42778d6246445c67d46b0a3764e17b62a (diff) | |
| download | anaconda-ea9f0d7cfee26140f6244899b48ae2125688bbba.tar.gz anaconda-ea9f0d7cfee26140f6244899b48ae2125688bbba.tar.xz anaconda-ea9f0d7cfee26140f6244899b48ae2125688bbba.zip | |
Remove unused functions and move storage-specific utils to storage.
This is the first pass at setting things up to split storage out into
a separate package.
It replaces the guts of iutil.execWithRedirect and iutil.execWithCapture
with a single backend function, _run_program. The main thing I can think
of that might be cause for complaint is that _run_program does not log
each output line as the external program outputs it, so you get the whole
output buffer at once. Storage gets its own copy of _run_program and
all of the calls in storage use the copy from storage.util.
The reason I moved all of the iutil arch functions into storage is that
they are mostly used in storage and I didn't want there to be two copies
of the whole set.
The rest is removing of unused things and moving of things only used by
storage into storage.
Diffstat (limited to 'tests/pyanaconda_test')
| -rw-r--r-- | tests/pyanaconda_test/network_test.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/pyanaconda_test/network_test.py b/tests/pyanaconda_test/network_test.py index a5afbe685..756c11d0a 100644 --- a/tests/pyanaconda_test/network_test.py +++ b/tests/pyanaconda_test/network_test.py @@ -211,8 +211,8 @@ class NetworkTest(mock.TestCase): def networkdevice_str_test(self): import pyanaconda.network - pyanaconda.network.iutil = mock.Mock() - pyanaconda.network.iutil.isS390.return_value = False + pyanaconda.network.arch = mock.Mock() + pyanaconda.network.arch.isS390.return_value = False nd = pyanaconda.network.NetworkDevice(self.NETSCRIPTSDIR, self.DEVICE) nd.info = {'HWADDR': '00:11:22:50:55:50', 'DEVICE': 'eth0', 'TYPE': 'Ethernet'} @@ -381,8 +381,8 @@ class NetworkTest(mock.TestCase): def iface_for_host_ip_test(self): import pyanaconda.network - pyanaconda.network.iutil = mock.Mock() - pyanaconda.network.iutil.execWithCapture.return_value = \ + pyanaconda.network.arch = mock.Mock() + pyanaconda.network.arch.execWithCapture.return_value = \ "10.0.0.2 dev eth0 src 10.0.0.1" ret = pyanaconda.network.ifaceForHostIP('10.0.0.2') |