travis: Make python 2.6 happy

Signed-off-by: Xuanwo <[email protected]>
qingstor · Jan 20, 2017 · 966bf89 · 966bf89
1 parent bbf6b7b
commit 966bf89
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/scenarios/steps/cp.py b/scenarios/steps/cp.py
@@ -38,14 +38,13 @@ def step_impl(context):
 @when(u'copy to QingStor key')
 def step_impl(context):
     for row in context.table:
-        command = qsctl(
+        qsctl(
             "cp",
             "tmp/{filename}".format(filename=row["name"]),
             "qs://{bucket}/{filename}".format(
                 bucket=test_data['bucket_name'], filename=row["name"]
             )
-        )
-        command.wait()
+        ).wait()
 
 
 @then(u'QingStor should have key')
@@ -60,13 +59,12 @@ def step_impl(context):
 
 @when(u'copy to QingStor keys recursively')
 def step_impl(context):
-    command = qsctl(
+    qsctl(
         "cp",
         "tmp",
         "qs://{bucket}".format(bucket=test_data['bucket_name']),
         "-r"
-    )
-    command.wait()
+    ).wait()
 
 
 @then(u'QingStor should have keys')
@@ -81,14 +79,13 @@ def step_impl(context):
 @when(u'copy to local file')
 def step_impl(context):
     for row in context.table:
-        command = qsctl(
+        qsctl(
             "cp",
             "qs://{bucket}/{filename}".format(
                 bucket=test_data['bucket_name'], filename=row["name"]
             ),
             "tmp/{filename}".format(filename=row["name"]),
-        )
-        command.wait()
+        ).wait()
 
 
 @then(u'local should have file')
@@ -106,15 +103,14 @@ def step_impl(context):
 
 @when(u'copy to local files recursively')
 def step_impl(context):
-    command = qsctl(
+    qsctl(
         "cp",
         "qs://{bucket}".format(
             bucket=test_data["bucket_name"],
         ),
         "tmp",
         "-r",
-    )
-    command.wait()
+    ).wait()
 
 
 @then(u'local should have files')

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -75,7 +75,7 @@ def setUp(self):
 
     def test_yaml_load(self):
         with open(self.conf_file, 'r') as f:
-            self.assertIsInstance(yaml_load(f), dict)
+            self.assertEqual(isinstance(yaml_load(f), dict), True)
 
     def test_load_conf_1(self):
         load_conf("")
@@ -84,7 +84,7 @@ def test_load_conf_2(self):
         load_conf(self.bad_conf_file)
 
     def test_load_conf_3(self):
-        self.assertIsInstance(load_conf(self.conf_file), dict)
+        self.assertEqual(isinstance(load_conf(self.conf_file), dict), True)
 
     def test_is_windows(self):
         if platform.system().lower() == "windows":