[Pkg-privacy-commits] [obfsproxy] 102/353: Enable obfs3 in the integration testers.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit 0bc44a7a94e4891c21ad9f0a559f752c969b5b42
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Jan 22 19:51:33 2013 +0200

    Enable obfs3 in the integration testers.
---
 obfsproxy/test/int_tests/test_pits.py |  6 ++++++
 obfsproxy/test/tester.py              | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/obfsproxy/test/int_tests/test_pits.py b/obfsproxy/test/int_tests/test_pits.py
index 3bcc8bb..9051129 100644
--- a/obfsproxy/test/int_tests/test_pits.py
+++ b/obfsproxy/test/int_tests/test_pits.py
@@ -38,6 +38,12 @@ class PITSTest(unittest.TestCase):
     def test_obfs2_2(self):
         return self._doTest("obfs2", "../test_case_simple.pits")
 
+    def test_obfs3_1(self):
+        return self._doTest("obfs3", "../test_case.pits")
+
+    def test_obfs3_2(self):
+        return self._doTest("obfs3", "../test_case_simple.pits")
+
 if __name__ == '__main__':
     from unittest import main
     main()
diff --git a/obfsproxy/test/tester.py b/obfsproxy/test/tester.py
index 8b67b9c..2b789df 100644
--- a/obfsproxy/test/tester.py
+++ b/obfsproxy/test/tester.py
@@ -201,6 +201,7 @@ class DirectTest(object):
         # transfer a file.  Then check whether the output is the same
         # as the input.
         self.input_chan.sendall(TEST_FILE)
+        time.sleep(1)
         try:
             output = self.output_reader.get()
         except Queue.Empty:
@@ -247,6 +248,15 @@ class DirectB64(DirectTest, unittest.TestCase):
                    "127.0.0.1:%d" % ENTRY_PORT,
                    "--dest=127.0.0.1:%d" % SERVER_PORT)
 
+class DirectObfs3(DirectTest, unittest.TestCase):
+    transport = "obfs3"
+    server_args = ("obfs3", "server",
+                   "127.0.0.1:%d" % SERVER_PORT,
+                   "--dest=127.0.0.1:%d" % EXIT_PORT)
+    client_args = ("obfs3", "client",
+                   "127.0.0.1:%d" % ENTRY_PORT,
+                   "--dest=127.0.0.1:%d" % SERVER_PORT)
+
 
 TEST_FILE = """\
 THIS IS A TEST FILE. IT'S USED BY THE INTEGRATION TESTS.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git