Port test_tintri to Python 3

* Set configuration.nfs_oversub_ratio, otherwise tests
  fail with TypeError on comparison between mock.Mock and int.
* tox.ini: add test_tintri to Python 3.4.

Change-Id: Ie2b5215795481bdfb11116876d83ef777a10c224
Partial-Implements: blueprint cinder-python3

diff --git a/cinder/tests/unit/test_tintri.py b/cinder/tests/unit/test_tintri.py
index d7cf987654b9902d744bac58486afad001b3026f..e9781f53b7d11c21f1d9ebfdf38689b4d634f79f 100644 (file)
--- a/cinder/tests/unit/test_tintri.py
+++ b/cinder/tests/unit/test_tintri.py
@@ -57,6 +57,7 @@ class TintriDriverTestCase(test.TestCase):
         configuration.nfs_mount_options = None
         configuration.nas_mount_options = None
         configuration.nfs_used_ratio = 0.95
+        configuration.nfs_oversub_ratio = 1.0
         return configuration
 
     def fake_stubs(self):

diff --git a/tests-py3.txt b/tests-py3.txt
index b4de72841016ce00f0070bc85361fb61a5e72ba6..a643b99b9f0bdb035ef4cb19ab3c28927d7bddbf 100644 (file)
--- a/tests-py3.txt
+++ b/tests-py3.txt
@@ -102,6 +102,7 @@ cinder.tests.unit.test_solidfire
 cinder.tests.unit.test_ssh_utils
 cinder.tests.unit.test_test
 cinder.tests.unit.test_test_utils
+cinder.tests.unit.test_tintri
 cinder.tests.unit.test_v6000_common
 cinder.tests.unit.test_v6000_fcp
 cinder.tests.unit.test_v6000_iscsi