[tor-commits] [stem/master] System test bugs caught by pylint

[atagar at torproject.org]

commit 70ab8ff1c2ccb858abe462dd1f9c3e81c1733659
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Nov 19 14:18:13 2011 -0800

    System test bugs caught by pylint
    
    Couple copy-paste bugs with the system integ tests.
---
 run_tests.py              |    1 -
 test/integ/util/system.py |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/run_tests.py b/run_tests.py
index 41df4bf..2358356 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -4,7 +4,6 @@
 Runs unit and integration tests.
 """
 
-import os
 import sys
 import time
 import getopt
diff --git a/test/integ/util/system.py b/test/integ/util/system.py
index 5d4a924..c246d55 100644
--- a/test/integ/util/system.py
+++ b/test/integ/util/system.py
@@ -184,13 +184,13 @@ class TestSystem(unittest.TestCase):
       self.skipTest("(pwdx unavailable)")
     
     # filter the call function to only allow this command
-    pwdx_prefix = GET_CWD_PWDX % ""
+    pwdx_prefix = stem.util.system.GET_CWD_PWDX % ""
     stem.util.system.CALL_MOCKING = lambda cmd: cmd.startswith(pwdx_prefix)
     
     runner_pid = test.runner.get_runner().get_pid()
     self.assertEquals(os.getcwd(), stem.util.system.get_cwd(runner_pid))
   
-  def test_get_cwd_pwdx(self):
+  def test_get_cwd_lsof(self):
     """
     Tests the get_pid_by_cwd function with a lsof response.
     """