[Pkg-privacy-commits] [obfsproxy] 106/353: Get the integration tests working with the new directory structure.

[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 e63d41a4af69118badbdfb7e8d864056fbc73b15
Author: George Kadianakis <desnacked at riseup.net>
Date:   Sat Jan 26 16:12:48 2013 +0200

    Get the integration tests working with the new directory structure.
---
 obfsproxy/test/int_tests/obfsproxy_tester.py | 2 +-
 obfsproxy/test/tester.py                     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/obfsproxy/test/int_tests/obfsproxy_tester.py b/obfsproxy/test/int_tests/obfsproxy_tester.py
index 343f69e..2b44b9e 100644
--- a/obfsproxy/test/int_tests/obfsproxy_tester.py
+++ b/obfsproxy/test/int_tests/obfsproxy_tester.py
@@ -67,7 +67,7 @@ class Obfsproxy(object):
     def __init__(self, *args, **kwargs):
         # Fix up our argv
         argv = []
-        argv.extend(('python', '../../../../obfsproxy.py', '--log-min-severity=warning'))
+        argv.extend(('python', '../../../../bin/pyobfsproxy', '--log-min-severity=warning'))
 
         # Extend hardcoded argv with user-specified options.
         if len(args) == 1 and (isinstance(args[0], list) or
diff --git a/obfsproxy/test/tester.py b/obfsproxy/test/tester.py
index 2b789df..abad45f 100644
--- a/obfsproxy/test/tester.py
+++ b/obfsproxy/test/tester.py
@@ -21,6 +21,7 @@ import subprocess
 import time
 import traceback
 import unittest
+import sys,os
 
 def diff(label, expected, received):
     """
@@ -46,7 +47,7 @@ class Obfsproxy(subprocess.Popen):
     """
     def __init__(self, *args, **kwargs):
         """Spawns obfsproxy with 'args'"""
-        argv = ["../../obfsproxy.py", "--no-log"]
+        argv = ["bin/pyobfsproxy", "--no-log"]
         if len(args) == 1 and (isinstance(args[0], list) or
                                isinstance(args[0], tuple)):
             argv.extend(args[0])

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