chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7fc55a3
)
Add FDroidPopen usage test
author
Dmitriy Bogdanov
<di72nn@gmail.com>
Wed, 17 Feb 2016 20:45:06 +0000
(
00:45
+0400)
committer
Dmitriy Bogdanov
<di72nn@gmail.com>
Wed, 17 Feb 2016 20:45:06 +0000
(
00:45
+0400)
tests/common.TestCase
patch
|
blob
|
history
diff --git
a/tests/common.TestCase
b/tests/common.TestCase
index d34569995509c1024dbfd269a9e3178dbc3dd50b..32e7af7f468c38bf7d7a3e8b71b9426ff4bde610 100755
(executable)
--- 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))
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()
if __name__ == "__main__":
parser = optparse.OptionParser()