← Back to branch summary

~lool/linaro-image-tools/efikamx

« back to all changes in this revision

Viewing changes to linaro_media_create/tests/test_media_create.py

  • Committer: Loïc Minier
  • Date: 2011-02-02 17:38:16 UTC
  • Revision ID: lool@dooz.org-20110202173816-n2c4w862hkg8wztz
Factor the prefer_dir computation which had to be repeated in the previous
merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
linaro_media_create/tests/test_media_create.py
97
97
    )
98
98
 
99
99
 
 
100
def preferred_tools_dir():
 
101
    prefer_dir = None
 
102
    # running from bzr checkout?
 
103
    if not os.path.isabs(__file__):
 
104
        prefer_dir = os.getcwd()
 
105
    return prefer_dir
 
106
 
 
107
 
100
108
class TestEnsureCommand(TestCaseWithFixtures):
101
109
 
102
110
    install_pkg_providing_called = False
135
143
 
136
144
    def test_existing_command(self):
137
145
        lmc = 'linaro-media-create'
138
 
        # running from bzr checkout?
139
 
        if os.path.isabs(__file__):
 
146
        prefer_dir = preferred_tools_dir()
 
147
        if prefer_dir is None:
140
148
            expected, _ = cmd_runner.run(
141
149
                ['which', lmc, ],
142
150
                stdout=subprocess.PIPE).communicate()
143
151
            expected = expected.strip()
144
152
        else:
145
 
            expected = os.path.join(os.getcwd(), lmc)
 
153
            expected = os.path.join(prefer_dir, lmc)
146
154
        self.assertEquals(expected, find_command(lmc))
147
155
 
148
156
    def test_nonexisting_command(self):
1112
1120
        fixture = self.useFixture(MockCmdRunnerPopenFixture())
1113
1121
        force_yes = True
1114
1122
 
1115
 
        prefer_dir = None
1116
 
        # running from bzr checkout?
1117
 
        if not os.path.isabs(__file__):
1118
 
            prefer_dir = os.getcwd()
 
1123
        prefer_dir = preferred_tools_dir()
1119
1124
 
1120
1125
        install_hwpacks(
1121
1126
            'chroot', '/tmp/dir', prefer_dir, force_yes, 'hwpack1.tgz',
1188
1193
            linaro_media_create.hwpack, 'run_local_atexit_funcs',
1189
1194
            mock_run_local_atexit_functions))
1190
1195
 
1191
 
        prefer_dir = None
1192
 
        # running from bzr checkout?
1193
 
        if not os.path.isabs(__file__):
1194
 
            prefer_dir = os.getcwd()
1195
 
 
1196
1196
        force_yes = True
1197
1197
        exception_caught = False
1198
1198
        try:
1199
1199
            install_hwpacks(
1200
 
                'chroot', '/tmp/dir', prefer_dir, force_yes, 'hwp.tgz',
1201
 
                'hwp2.tgz')
 
1200
                'chroot', '/tmp/dir', preferred_tools_dir(), force_yes,
 
1201
                'hwp.tgz', 'hwp2.tgz')
1202
1202
        except:
1203
1203
            exception_caught = True
1204
1204
        self.assertTrue(self.run_local_atexit_functions_called)