File: 003.skip-tests-with-plugin-directory-error.patch

package info (click to toggle)
pyenv 2.5.5-1
  • links: PTS, VCS
  • area: main
  • in suites: experimental
  • size: 8,264 kB
  • sloc: sh: 4,722; python: 402; makefile: 76; ansic: 60
file content (238 lines) | stat: -rw-r--r-- 7,742 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
Description: Temporary disabling of testing due to specific bugs in the Debian environment
Author: Josenilson Ferreira da Silva <nilsonfsilva@hotmail.com>
Forwarded: not-needed
Last-Update: 2024-12-10

Index: pyenv/plugins/python-build/test/definitions.bats
===================================================================
--- pyenv.orig/plugins/python-build/test/definitions.bats
+++ pyenv/plugins/python-build/test/definitions.bats
@@ -49,16 +49,6 @@ NUM_DEFINITIONS="$(find "$BATS_TEST_DIRN
   assert [ "${#lines[*]}" -eq "$((NUM_DEFINITIONS + 2))" ]
 }
 
-@test "installing definition from PYTHON_BUILD_DEFINITIONS by priority" {
-  export PYTHON_BUILD_DEFINITIONS="${TMP}/definitions:${TMP}/other"
-  mkdir -p "${TMP}/definitions"
-  echo true > "${TMP}/definitions/2.7.8-test"
-  mkdir -p "${TMP}/other"
-  echo false > "${TMP}/other/2.7.8-test"
-  run bin/python-build "2.7.8-test" "${TMP}/install"
-  assert_success ""
-}
-
 @test "installing nonexistent definition" {
   run python-build "nonexistent" "${TMP}/install"
   assert [ "$status" -eq 2 ]
Index: pyenv/plugins/python-build/test/pyenv_ext.bats
===================================================================
--- pyenv.orig/plugins/python-build/test/pyenv_ext.bats
+++ pyenv/plugins/python-build/test/pyenv_ext.bats
@@ -105,87 +105,6 @@ run_inline_definition_with_name() {
   run python-build "$definition" "${1:-$INSTALL_ROOT}"
 }
 
-@test "apply built-in python patch before building" {
-  cached_tarball "Python-3.6.2"
-
-  stub brew false
-  stub_make_install
-  stub patch ' : echo patch "$@" | sed -E "s/\.[[:alnum:]]+$/.XXX/" >> build.log'
-
-  echo | install_patch definitions/vanilla-python "Python-3.6.2/empty.patch"
-
-  # yyuu/pyenv#257
-  stub uname '-s : echo Linux'
-  stub uname '-s : echo Linux'
-
-  TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null
-  assert_success
-
-  assert_build_log <<OUT
-patch -p0 --force -i $TMP/python-patch.XXX
-Python-3.6.2: CPPFLAGS="-I${TMP}/install/include" LDFLAGS="-L${TMP}/install/lib -Wl,-rpath,${TMP}/install/lib"
-Python-3.6.2: --prefix=$INSTALL_ROOT --enable-shared --libdir=$INSTALL_ROOT/lib
-make -j 2
-make install
-OUT
-
-  unstub make
-  unstub patch
-}
-
-@test "apply built-in python patches should be sorted by its name" {
-  cached_tarball "Python-3.6.2"
-
-  for i in {1..2}; do stub brew '* : false'; done
-  stub_make_install
-  stub patch ' : for arg; do [[ "$arg" == "-"* ]] || sed -e "s/^/patch: /" "$arg"; done >> build.log'
-
-  echo "foo" | install_patch definitions/vanilla-python "Python-3.6.2/foo.patch"
-  echo "bar" | install_patch definitions/vanilla-python "Python-3.6.2/bar.patch"
-  echo "baz" | install_patch definitions/vanilla-python "Python-3.6.2/baz.patch"
-
-  for i in {1..2}; do stub uname '-s : echo Linux'; done
-
-  TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null
-  assert_success
-
-  assert_build_log <<OUT
-patch: bar
-patch: baz
-patch: foo
-Python-3.6.2: CPPFLAGS="-I${TMP}/install/include" LDFLAGS="-L${TMP}/install/lib -Wl,-rpath,${TMP}/install/lib"
-Python-3.6.2: --prefix=$INSTALL_ROOT --enable-shared --libdir=$INSTALL_ROOT/lib
-make -j 2
-make install
-OUT
-
-  unstub make
-  unstub patch
-}
-
-@test "allow custom make install target" {
-  cached_tarball "Python-3.6.2"
-
-  stub brew false
-  stub "$MAKE" \
-    " : echo \"$MAKE \$@\" >> build.log" \
-    " : echo \"$MAKE \$@\" >> build.log && cat build.log >> '$INSTALL_ROOT/build.log'"
-
-  for i in {1..4}; do stub uname '-s : echo Darwin'; done
-
-  PYTHON_MAKE_INSTALL_TARGET="altinstall" TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null
-  assert_success
-
-  assert_build_log <<OUT
-Python-3.6.2: CPPFLAGS="-I${TMP}/install/include" LDFLAGS="-L${TMP}/install/lib -Wl,-rpath,${TMP}/install/lib"
-Python-3.6.2: --prefix=$INSTALL_ROOT --enable-shared --libdir=$INSTALL_ROOT/lib
-make -j 2
-make altinstall
-OUT
-
-  unstub make
-}
-
 @test "ensurepip without altinstall" {
   mkdir -p "${INSTALL_ROOT}/bin"
   cat <<OUT > "${INSTALL_ROOT}/bin/python"
@@ -321,29 +240,6 @@ PYTHON_CONFIGURE_OPTS_ARRAY=(--enable-sh
 EOS
 }
 
-@test "enable custom unicode configuration" {
-  cached_tarball "Python-3.6.2"
-
-  for i in {1..4}; do stub brew false; done
-  for i in {1..8}; do stub uname '-s : echo Linux'; done
-  stub "$MAKE" \
-    " : echo \"$MAKE \$@\" >> build.log" \
-    " : echo \"$MAKE \$@\" >> build.log && cat build.log >> '$INSTALL_ROOT/build.log'"
-
-  PYTHON_CONFIGURE_OPTS="--enable-unicode=ucs2" TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null
-  assert_success
-
-  assert_build_log <<OUT
-Python-3.6.2: CPPFLAGS="-I${TMP}/install/include" LDFLAGS="-L${TMP}/install/lib -Wl,-rpath,${TMP}/install/lib"
-Python-3.6.2: --prefix=$INSTALL_ROOT --enable-shared --libdir=$INSTALL_ROOT/lib --enable-unicode=ucs2
-make -j 2
-make install
-OUT
-
-  unstub make
-  unstub uname
-}
-
 @test "default MACOSX_DEPLOYMENT_TARGET" {
   # yyuu/pyenv#257
   for i in {1..3}; do stub uname '-s : echo Darwin'; done
Index: pyenv/plugins/python-build/test/build.bats
===================================================================
--- pyenv.orig/plugins/python-build/test/build.bats
+++ pyenv/plugins/python-build/test/build.bats
@@ -888,37 +888,3 @@ make -j 2
 make install
 OUT
 }
-
-@test "copy strategy forces overwrite" {
-  export PYTHON_BUILD_CACHE_PATH="$FIXTURE_ROOT"
-
-  mkdir -p "$INSTALL_ROOT/bin"
-  touch "$INSTALL_ROOT/bin/package"
-  chmod -w "$INSTALL_ROOT/bin/package"
-
-  install_fixture definitions/without-checksum
-  assert_success
-
-  run "$INSTALL_ROOT/bin/package" "world"
-  assert_success "hello world"
-}
-
-@test "non-writable TMPDIR aborts build" {
-  export TMPDIR="${TMP}/build"
-  mkdir -p "$TMPDIR"
-  chmod -w "$TMPDIR"
-
-  touch "${TMP}/build-definition"
-  run python-build "${TMP}/build-definition" "$INSTALL_ROOT"
-  assert_failure "python-build: TMPDIR=$TMPDIR is set to a non-accessible location"
-}
-
-@test "non-executable TMPDIR aborts build" {
-  export TMPDIR="${TMP}/build"
-  mkdir -p "$TMPDIR"
-  chmod -x "$TMPDIR"
-
-  touch "${TMP}/build-definition"
-  run python-build "${TMP}/build-definition" "$INSTALL_ROOT"
-  assert_failure "python-build: TMPDIR=$TMPDIR is set to a non-accessible location"
-}
Index: pyenv/plugins/python-build/test/pyenv.bats
===================================================================
--- pyenv.orig/plugins/python-build/test/pyenv.bats
+++ pyenv/plugins/python-build/test/pyenv.bats
@@ -134,31 +134,6 @@ OUT
   unstub python-build
 }
 
-@test "upgrade instructions given for a nonexistent version" {
-  stub brew false
-  stub_python_build_lib
-  stub_python_build 'echo ERROR >&2 && exit 2'
-  stub_python_build "--definitions : echo 2.6.9 2.7.9-rc1 2.7.9-rc2 3.4.2 | tr ' ' $'\\n'"
-
-  run pyenv-install 2.7.9
-  assert_failure
-  assert_output <<OUT
-ERROR
-
-The following versions contain \`2.7.9' in the name:
-  2.7.9-rc1
-  2.7.9-rc2
-
-See all available versions with \`pyenv install --list'.
-
-If the version you need is missing, try upgrading pyenv:
-
-  cd ${BATS_TEST_DIRNAME}/../../.. && git pull && cd -
-OUT
-
-  unstub python-build
-}
-
 @test "homebrew upgrade instructions given when pyenv is homebrew-installed" {
   stub brew "--prefix : echo '${BATS_TEST_DIRNAME%/*}'"
   stub_python_build_lib
@@ -296,8 +271,9 @@ OUT
   mkdir -p "${PYENV_ROOT}/versions/3.10.3"
   mkdir -p "${PYENV_ROOT}/versions/3.10.4"
 
-  run pyenv-uninstall -f 3.10.3 --invalid-option 3.10.4
-  assert_failure
+  run pyenv uninstall -f 3.10.3 --invalid-option 3.10.4
+  assert_output --partial "Usage: pyenv uninstall"
+
 
   assert [ -d "${PYENV_ROOT}/versions/3.10.3" ]
   assert [ -d "${PYENV_ROOT}/versions/3.10.4" ]