[blivet:master] Adapt existing tests to changed signature of some methods

Vratislav Podzimek vpodzime at redhat.com
Mon Mar 31 09:26:54 UTC 2014


On Thu, 2014-03-27 at 09:01 -0400, mulhern wrote:
> Signed-off-by: mulhern <amulhern at redhat.com>
> ---
>  tests/devicelibs_test/lvm_test.py    | 8 ++++----
>  tests/devicelibs_test/mdraid_test.py | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/devicelibs_test/lvm_test.py b/tests/devicelibs_test/lvm_test.py
> index 91b71f6..655b5ff 100755
> --- a/tests/devicelibs_test/lvm_test.py
> +++ b/tests/devicelibs_test/lvm_test.py
> @@ -57,7 +57,7 @@ class LVMAsRootTestCase(baseclass.DevicelibsTestCase):
>  
>          try:
>              lvm.vgdeactivate(self._vg_name)
> -            lvm.vgreduce(self._vg_name, [], rm=True)
> +            lvm.vgreduce(self._vg_name, None, missing=True)
>          except lvm.LVMError:
>              pass
>  
> @@ -138,11 +138,11 @@ class LVMAsRootTestCase(baseclass.DevicelibsTestCase):
>          ## vgreduce
>          ##
>          # pass
> -        self.assertEqual(lvm.vgreduce(self._vg_name, [_LOOP_DEV1]), None)
> +        self.assertEqual(lvm.vgreduce(self._vg_name, _LOOP_DEV1), None)
>  
>          # fail
> -        self.assertRaises(lvm.LVMError, lvm.vgreduce, "wrong-vg-name", [_LOOP_DEV1])
> -        self.assertRaises(lvm.LVMError, lvm.vgreduce, self._vg_name, ["/not/existing/device"])
> +        self.assertRaises(lvm.LVMError, lvm.vgreduce, "wrong-vg-name", _LOOP_DEV1)
> +        self.assertRaises(lvm.LVMError, lvm.vgreduce, self._vg_name, "/not/existing/device")
>  
>          ##
>          ## vgactivate
> diff --git a/tests/devicelibs_test/mdraid_test.py b/tests/devicelibs_test/mdraid_test.py
> index 9c1584e..1ff710f 100755
> --- a/tests/devicelibs_test/mdraid_test.py
> +++ b/tests/devicelibs_test/mdraid_test.py
> @@ -97,7 +97,7 @@ class MDRaidAsRootTestCase(baseclass.DevicelibsTestCase):
>          # TODO
>  
>          # fail
> -        self.assertRaises(mdraid.MDRaidError, mdraid.mdadd, "/not/existing/device")
> +        self.assertRaises(mdraid.MDRaidError, mdraid.mdadd, self._dev_name, "/not/existing/device")
>  
>          ##
>          ## mdactivate
ACK.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list