merge fix

1 files changed, 20 insertions, 46 deletions

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index 54a1c55a2d..81449b4a42 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -356,24 +356,17 @@ namespace tut
 
         // Create a script file in a temporary place.
         NamedTempFile script("py",
-			"from __future__ import print_function" EOL
+            "from __future__ import print_function" EOL
             "import sys" EOL
             "import time" EOL
             EOL
             "time.sleep(2)" EOL
-<<<<<<< HEAD
             "print('stdout after wait',file=sys.stdout)" EOL
             "sys.stdout.flush()" EOL
             "time.sleep(2)" EOL
             "print('stderr after wait',file=sys.stderr)" EOL
-=======
-            "print('stdout after wait', file=sys.stdout)" EOL
-            "sys.stdout.flush()" EOL
-            "time.sleep(2)" EOL
-            "print('stderr after wait', file=sys.stderr)" EOL
->>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546
             "sys.stderr.flush()" EOL
-            );
+        );
 
         // Arrange to track the history of our interaction with child: what we
         // fetched, which pipe it came from, how many tries it took before we
@@ -869,11 +862,8 @@ namespace tut
         set_test_name("'bogus' test");
         CaptureLog recorder;
         PythonProcessLauncher py(get_test_name(),
-<<<<<<< HEAD
-                                 "from __future__ import print_function\n"
-=======
->>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546
-                                 "print('Hello world')\n");
+            "from __future__ import print_function\n"
+            "print('Hello world')\n");
         py.mParams.files.add(LLProcess::FileParam("bogus"));
         py.mPy = LLProcess::create(py.mParams);
         ensure("should have rejected 'bogus'", ! py.mPy);
@@ -888,11 +878,8 @@ namespace tut
         // Replace this test with one or more real 'file' tests when we
         // implement 'file' support
         PythonProcessLauncher py(get_test_name(),
-<<<<<<< HEAD
-                                 "from __future__ import print_function\n"
-=======
->>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546
-                                 "print('Hello world')\n");
+            "from __future__ import print_function\n"
+            "print('Hello world')\n");
         py.mParams.files.add(LLProcess::FileParam());
         py.mParams.files.add(LLProcess::FileParam("file"));
         py.mPy = LLProcess::create(py.mParams);
@@ -907,11 +894,8 @@ namespace tut
         // implement 'tpipe' support
         CaptureLog recorder;
         PythonProcessLauncher py(get_test_name(),
-<<<<<<< HEAD
-                                 "from __future__ import print_function\n"
-=======
->>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546
-                                 "print('Hello world')\n");
+            "from __future__ import print_function\n"
+            "print('Hello world')\n");
         py.mParams.files.add(LLProcess::FileParam());
         py.mParams.files.add(LLProcess::FileParam("tpipe"));
         py.mPy = LLProcess::create(py.mParams);
@@ -928,11 +912,8 @@ namespace tut
         // implement 'npipe' support
         CaptureLog recorder;
         PythonProcessLauncher py(get_test_name(),
-<<<<<<< HEAD
-                                 "from __future__ import print_function\n"
-=======
->>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546
-                                 "print('Hello world')\n");
+            "from __future__ import print_function\n"
+            "print('Hello world')\n");
         py.mParams.files.add(LLProcess::FileParam());
         py.mParams.files.add(LLProcess::FileParam());
         py.mParams.files.add(LLProcess::FileParam("npipe"));
@@ -1008,24 +989,20 @@ namespace tut
     {
         set_test_name("get*Pipe() validation");
         PythonProcessLauncher py(get_test_name(),
-<<<<<<< HEAD
-                                 "from __future__ import print_function\n"
-                                 "print('this output is expected')\n");
-=======
-                                 "print('this output is expected)'\n");
->>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546
+            "from __future__ import print_function\n"
+            "print('this output is expected')\n");
         py.mParams.files.add(LLProcess::FileParam("pipe")); // pipe for  stdin
         py.mParams.files.add(LLProcess::FileParam());       // inherit stdout
         py.mParams.files.add(LLProcess::FileParam("pipe")); // pipe for stderr
         py.run();
         TEST_getPipe(*py.mPy, getWritePipe, getOptWritePipe,
-                     LLProcess::STDIN,   // VALID
-                     LLProcess::STDOUT,  // NOPIPE
-                     LLProcess::STDERR); // BADPIPE
+            LLProcess::STDIN,   // VALID
+            LLProcess::STDOUT,  // NOPIPE
+            LLProcess::STDERR); // BADPIPE
         TEST_getPipe(*py.mPy, getReadPipe,  getOptReadPipe,
-                     LLProcess::STDERR,  // VALID
-                     LLProcess::STDOUT,  // NOPIPE
-                     LLProcess::STDIN);  // BADPIPE
+            LLProcess::STDERR,  // VALID
+            LLProcess::STDOUT,  // NOPIPE
+            LLProcess::STDIN);  // BADPIPE
     }
 
     template<> template<>
@@ -1152,11 +1129,8 @@ namespace tut
     {
         set_test_name("ReadPipe \"eof\" event");
         PythonProcessLauncher py(get_test_name(),
-<<<<<<< HEAD
-                                 "from __future__ import print_function\n"
-=======
->>>>>>> 6ca09a94554ec01f5c94ec60fffd01d7e33f3546
-                                 "print('Hello from Python!')\n");
+            "from __future__ import print_function\n"
+            "print('Hello from Python!')\n");
         py.mParams.files.add(LLProcess::FileParam()); // stdin
         py.mParams.files.add(LLProcess::FileParam("pipe")); // stdout
         py.launch();