← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_win32utils.py

Merge fetch-spec-everything-not-in-other.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_win32utils.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
"""Tests for win32utils."""
18
18
 
19
19
import os
20
 
import sys
21
20
 
22
21
from bzrlib import (
23
22
    osutils,
217
216
    def test_appdata_not_using_environment(self):
218
217
        # Test that we aren't falling back to the environment
219
218
        first = win32utils.get_appdata_location()
220
 
        self._captureVar("APPDATA", None)
 
219
        self.overrideEnv("APPDATA", None)
221
220
        self.assertPathsEqual(first, win32utils.get_appdata_location())
222
221
 
223
222
    def test_appdata_matches_environment(self):
234
233
    def test_local_appdata_not_using_environment(self):
235
234
        # Test that we aren't falling back to the environment
236
235
        first = win32utils.get_local_appdata_location()
237
 
        self._captureVar("LOCALAPPDATA", None)
 
236
        self.overrideEnv("LOCALAPPDATA", None)
238
237
        self.assertPathsEqual(first, win32utils.get_local_appdata_location())
239
238
 
240
239
    def test_local_appdata_matches_environment(self):