Update tempest to inherit from VmReady1

[functest.git] / functest / opnfv_tests / openstack / patrole / patrole.py

diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py
index 0c5eedf..a00e17c 100644 (file)
--- a/functest/opnfv_tests/openstack/patrole/patrole.py
+++ b/functest/opnfv_tests/openstack/patrole/patrole.py
@@ -12,7 +12,8 @@
 import logging
 import os
 
-from functest.opnfv_tests.openstack.tempest import conf_utils
+from six.moves import configparser
+
 from functest.opnfv_tests.openstack.tempest import tempest
 from functest.utils import config
 
@@ -34,7 +35,7 @@ class Patrole(tempest.TempestCommon):
 
     def configure(self, **kwargs):
         super(Patrole, self).configure(**kwargs)
-        rconfig = conf_utils.ConfigParser.RawConfigParser()
+        rconfig = configparser.RawConfigParser()
         rconfig.read(self.conf_file)
         rconfig.add_section('rbac')
         rconfig.set('rbac', 'enable_rbac', True)
@@ -43,11 +44,6 @@ class Patrole(tempest.TempestCommon):
             rconfig.write(config_file)
         self.backup_tempest_config(self.conf_file, self.res_dir)
 
-    def generate_test_list(self):
-        self.backup_tempest_config(self.conf_file, '/etc')
-        super(Patrole, self).generate_test_list()
-        os.remove('/etc/tempest.conf')
-
     def run(self, **kwargs):
         for exclude in kwargs.get('exclude', []):
             self.mode = "{}(?!.*{})".format(self.mode, exclude)