summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2003-03-25 18:50:19 (GMT)
committerThomas Wouters <thomas@python.org>2003-03-25 18:50:19 (GMT)
commit590fe02ebdc2ec11347441ae31e71d2d6cd52ad3 (patch)
tree085b8783c18f50eb112d794d52b17c1cdcdf9612
parent49754af873464babc9f2eb8359016e68e99577b6 (diff)
downloadcpython-590fe02ebdc2ec11347441ae31e71d2d6cd52ad3.zip
cpython-590fe02ebdc2ec11347441ae31e71d2d6cd52ad3.tar.gz
cpython-590fe02ebdc2ec11347441ae31e71d2d6cd52ad3.tar.bz2
CommandTests.testgetoutput():
Make sure we aren't masking any errors raised in tempfile.mkdtemp() by referencing the (then) unbound local 'dir'.
-rw-r--r--Lib/test/test_commands.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_commands.py b/Lib/test/test_commands.py
index ef87d79..0f7d15f 100644
--- a/Lib/test/test_commands.py
+++ b/Lib/test/test_commands.py
@@ -27,6 +27,7 @@ class CommandTests(unittest.TestCase):
# we use mkdtemp in the next line to create an empty directory
# under our exclusive control; from that, we can invent a pathname
# that we _know_ won't exist. This is guaranteed to fail.
+ dir = None
try:
dir = tempfile.mkdtemp()
name = os.path.join(dir, "foo")
@@ -34,7 +35,8 @@ class CommandTests(unittest.TestCase):
status, output = getstatusoutput('cat ' + name)
self.assertNotEquals(status, 0)
finally:
- os.rmdir(dir)
+ if dir is not None:
+ os.rmdir(dir)
def test_getstatus(self):
# This pattern should match 'ls -ld /.' on any posix