From: Eric Harney <eharney@redhat.com>
Date: Fri, 19 Jun 2015 14:25:50 +0000 (-0400)
Subject: Revert "Disable backup progress notifications for unit tests"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=226e804ab318dd3303048eec826b71f4f9b24c6a;p=openstack-build%2Fcinder-build.git

Revert "Disable backup progress notifications for unit tests"

This reverts commit e5f6ed69e0031900f97da185b5363ebd3dd60c0c.

This was an attempted workaround for the notifier issue.
It's not needed now that the fake notifier has been fixed,
so restore the default behavior.

Also remove conf imports which were added in commit d9b9ac
to fix commit e5f6ed.

Related-Bug: #1412513

Change-Id: Id0d547e3c2faa8c1a0555e28cdb2e9d83956c1ac
---

diff --git a/cinder/tests/unit/conf_fixture.py b/cinder/tests/unit/conf_fixture.py
index 9f6f8152f..7f101c5d6 100644
--- a/cinder/tests/unit/conf_fixture.py
+++ b/cinder/tests/unit/conf_fixture.py
@@ -21,10 +21,6 @@ from oslo_config import cfg
 
 CONF = cfg.CONF
 
-CONF.import_opt('backup_enable_progress_timer',
-                'cinder.backup.drivers.nfs')
-CONF.import_opt('backup_swift_enable_progress_timer',
-                'cinder.backup.drivers.swift')
 CONF.import_opt('policy_file', 'cinder.policy', group='oslo_policy')
 CONF.import_opt('volume_driver', 'cinder.volume.manager')
 CONF.import_opt('xiv_ds8k_proxy',
@@ -57,5 +53,3 @@ def set_defaults(conf):
         os.path.join(os.path.dirname(__file__), '..', '..', '..')))
     conf.set_default('policy_dirs', [], group='oslo_policy')
     conf.set_default('auth_strategy', 'noauth')
-    conf.set_default('backup_enable_progress_timer', False)
-    conf.set_default('backup_swift_enable_progress_timer', False)