diff options
author | kshithijiyer <kshithij.ki@gmail.com> | 2020-02-18 13:21:05 +0530 |
---|---|---|
committer | Bala Konda Reddy M <bala12352@gmail.com> | 2020-02-19 06:07:02 +0000 |
commit | 75898ee995b08892ab4b936094a58d4321fc24a6 (patch) | |
tree | 448d34429fe6fee1534c9f40d8d2f51a2942fda8 /tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py | |
parent | 26052f310bb977aa1538933b46667a1e9c6ef440 (diff) |
[TestFix] Changing code used to create arbiter volumes
As distributed-arbiter and arbiter weren't present before patch [1],
arbiter and distributed-arbiter volumes were created by the hack show
below where a distributed-replicated or replicated volume's configuration
was modified to create an arbiter volume.
```
@runs_on([['replicated', 'distributed-replicated'],
['glusterfs', 'nfs']])
class TestSelfHeal(GlusterBaseClass):
.................
@classmethod
def setUpClass(cls):
...............
# Overriding the volume type to specifically test the volume
# type Change from distributed-replicated to arbiter
if cls.volume_type == "distributed-replicated":
cls.volume['voltype'] = { 'type': 'distributed-replicated',
'dist_count': 2,
'replica_count': 3,
'arbiter_count': 1,
'transport': 'tcp'}
```
Now this code is to be updated where we need to remove code which
was used to override volume configuration and
just add arbiter or distributed-arbiter in `@runs_on([],[])`
as shown below:
```
@runs_on([['replicated', 'distributed-arbiter'],
['glusterfs', 'nfs']])
class TestSelfHeal(GlusterBaseClass):
```
Links:
[1] https://github.com/gluster/glusto-tests/commit/08b727842bc66603e3b8d1160ee4b15051b0cd20
Change-Id: I4c44c2f3506bd0183fd991354fb723f8ec235a4b
Signed-off-by: kshithijiyer <kshithij.ki@gmail.com>
Diffstat (limited to 'tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py')
-rw-r--r-- | tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py b/tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py index d6593ac82..2c0490b9f 100644 --- a/tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py +++ b/tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2018 Red Hat, Inc. <http://www.redhat.com> +# Copyright (C) 2015-2020 Red Hat, Inc. <http://www.redhat.com> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,7 +32,7 @@ from glustolibs.io.utils import (collect_mounts_arequal, wait_for_io_to_complete) -@runs_on([['distributed-replicated'], +@runs_on([['distributed-arbiter'], ['glusterfs', 'nfs', 'cifs']]) class TestArbiterSelfHeal(GlusterBaseClass): """ @@ -61,19 +61,6 @@ class TestArbiterSelfHeal(GlusterBaseClass): def setUp(self): # Calling GlusterBaseClass setUp self.get_super_method(self, 'setUp')() - - # Setup Volumes - if self.volume_type == "distributed-replicated": - self.volume_configs = [] - - # Redefine distributed-replicated volume - self.volume['voltype'] = { - 'type': 'distributed-replicated', - 'replica_count': 3, - 'dist_count': 2, - 'arbiter_count': 1, - 'transport': 'tcp'} - self.all_mounts_procs = [] self.io_validation_complete = False |