Python 2.6 compatibility change in test_searchcommands_app.py

David Noble · David Noble · commit 03c171a06be9 · 2013-12-19T21:59:04.000-08:00
diff --git a/tests/test_searchcommands_app.py b/tests/test_searchcommands_app.py
@@ -383,18 +383,14 @@ def test_streaming_command_on_server(self):
     def _assertCorrectConfiguration(self, command, test_name):
         expected_file_location = os.path.join('_expected_results', test_name + '.txt')
         output_file_location = os.path.join('output', test_name + '.csv')
-        with \
-            TestSearchCommandsApp._open_data_file(
-                'input/_empty.csv', 'r') as input_file, \
-            TestSearchCommandsApp._open_data_file(
-                output_file_location, 'w') as output_file:
-            command.process(
-                [command.name, '__GETINFO__', 'fieldname="foo"'],
-                input_file,
-                output_file)
+        with TestSearchCommandsApp._open_data_file('input/_empty.csv', 'r') as input_file:
+            with TestSearchCommandsApp._open_data_file(output_file_location, 'w') as output_file:
+                command.process(
+                    [command.name, '__GETINFO__', 'fieldname="foo"'],
+                    input_file,
+                    output_file)
         actual = str(command.configuration)
-        with TestSearchCommandsApp._open_data_file(
-                expected_file_location, 'r') as input_file:
+        with TestSearchCommandsApp._open_data_file(expected_file_location, 'r') as input_file:
             expected = ''.join(input_file.readlines())
         self.assertMultiLineEqual(expected, actual)
 
@@ -416,11 +412,10 @@ def _assertCorrectOneshotResults(self, query, test_name):
     def _assertCorrectOutputFile(self, name):
         expected = os.path.join('_expected_results', name)
         actual = os.path.join('output', name)
-        with \
-            TestSearchCommandsApp._open_data_file(expected, 'r') as expected, \
-            TestSearchCommandsApp._open_data_file(actual, 'r') as actual:
-            for actual_line, expected_line in zip(actual, expected):
-                self.assertTrue(actual_line == expected_line)
+        with TestSearchCommandsApp._open_data_file(expected, 'r') as expected:
+            with TestSearchCommandsApp._open_data_file(actual, 'r') as actual:
+                for actual_line, expected_line in zip(actual, expected):
+                    self.assertTrue(actual_line == expected_line)
         return
 
     def _run(self, command, args, **kwargs):
