From: Dmitriy Bogdanov <di72nn@gmail.com>
Date: Wed, 17 Feb 2016 20:45:06 +0000 (+0400)
Subject: Add FDroidPopen usage test
X-Git-Tag: 0.7.0~98^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5d54b761af7378f1a00084676c1f8c83addf2912;p=fdroidserver.git

Add FDroidPopen usage test
---

diff --git a/tests/common.TestCase b/tests/common.TestCase
index d3456999..32e7af7f 100755
--- a/tests/common.TestCase
+++ b/tests/common.TestCase
@@ -149,6 +149,14 @@ class CommonTest(unittest.TestCase):
         self.assertIsNotNone(re.search('android:versionName="%s"' % build.version, filedata))
         self.assertIsNotNone(re.search('android:versionCode="%s"' % build.vercode, filedata))
 
+    def test_fdroid_popen_stderr_redirect(self):
+        commands = ['sh', '-c', 'echo stdout message && echo stderr message 1>&2']
+
+        p = fdroidserver.common.FDroidPopen(commands)
+        self.assertEqual(p.output, 'stdout message\nstderr message\n')
+
+        p = fdroidserver.common.FDroidPopen(commands, stderr_to_stdout=False)
+        self.assertEqual(p.output, 'stdout message\n')
 
 if __name__ == "__main__":
     parser = optparse.OptionParser()