[Pkg-privacy-commits] [obfsproxy] 247/353: Slightly edit scramblesuit unittests so that they run in obfsproxy.

[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 090252c77fc5255dba15c5a0da9a6aa668bec481
Author: George Kadianakis <desnacked at riseup.net>
Date:   Sun Mar 2 14:49:50 2014 +0000

    Slightly edit scramblesuit unittests so that they run in obfsproxy.
---
 obfsproxy/test/transports/test_scramblesuit.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/obfsproxy/test/transports/test_scramblesuit.py b/obfsproxy/test/transports/test_scramblesuit.py
index 24feb7c..541d92e 100644
--- a/obfsproxy/test/transports/test_scramblesuit.py
+++ b/obfsproxy/test/transports/test_scramblesuit.py
@@ -1,17 +1,10 @@
 import unittest
 
 import os
-import util
-import const
-import mycrypto
-import uniformdh
-import scramblesuit
 import base64
 import shutil
 import tempfile
 
-import message
-
 import Crypto.Hash.SHA256
 import Crypto.Hash.HMAC
 
@@ -20,6 +13,18 @@ import obfsproxy.network.buffer as obfs_buf
 import obfsproxy.common.transport_config as transport_config
 import obfsproxy.transports.base as base
 
+import obfsproxy.transports.scramblesuit.util as util
+import obfsproxy.transports.scramblesuit.const as const
+import obfsproxy.transports.scramblesuit.mycrypto as mycrypto
+import obfsproxy.transports.scramblesuit.uniformdh as uniformdh
+import obfsproxy.transports.scramblesuit.scramblesuit as scramblesuit
+import obfsproxy.transports.scramblesuit.message as message
+
+# Disable all logging as it would yield plenty of warning and error
+# messages.
+log = logging.get_obfslogger()
+log.disable_logs()
+
 class CryptoTest( unittest.TestCase ):
 
     """
@@ -310,9 +315,4 @@ class MessageTest( unittest.TestCase ):
 
 
 if __name__ == '__main__':
-    # Disable all logging as it would yield plenty of warning and error
-    # messages.
-    log = logging.get_obfslogger()
-    log.disable_logs()
-
     unittest.main()

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