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
|
#!/usr/bin/env python
#
# shelve_tests.py: testing shelving
#
# Subversion is a tool for revision control.
# See http://subversion.apache.org for more information.
#
# ====================================================================
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
######################################################################
# General modules
import shutil, stat, re, os, sys, logging
logger = logging.getLogger()
# Our testing module
import svntest
from svntest import wc
# (abbreviation)
Skip = svntest.testcase.Skip_deco
SkipUnless = svntest.testcase.SkipUnless_deco
XFail = svntest.testcase.XFail_deco
Issues = svntest.testcase.Issues_deco
Issue = svntest.testcase.Issue_deco
Wimp = svntest.testcase.Wimp_deco
Item = wc.StateItem
#----------------------------------------------------------------------
def shelve_unshelve_verify(sbox, global_opts=()):
"""Round-trip: shelve; verify all changes are reverted;
unshelve; verify all changes are restored.
"""
wc_dir = sbox.wc_dir
# Save the modified state
_, output, _ = svntest.main.run_svn(None, 'status', '-v', '-u', '-q',
wc_dir)
modified_state = svntest.wc.State.from_status(output, wc_dir)
# Shelve; check there are no longer any modifications
svntest.actions.run_and_verify_svn(None, [],
'shelve', 'foo', *global_opts)
virginal_state = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_status(wc_dir, virginal_state)
# Unshelve; check the original modifications are here again
svntest.actions.run_and_verify_svn(None, [],
'unshelve', 'foo', *global_opts)
svntest.actions.run_and_verify_status(wc_dir, modified_state)
#----------------------------------------------------------------------
def shelve_unshelve(sbox, modifier, global_opts=()):
"""Round-trip: build 'sbox'; apply changes by calling 'modifier(sbox)';
shelve and unshelve; verify changes are fully reverted and restored.
"""
sbox.build()
was_cwd = os.getcwd()
os.chdir(sbox.wc_dir)
sbox.wc_dir = ''
# Make some changes to the working copy
modifier(sbox)
shelve_unshelve_verify(sbox, global_opts)
os.chdir(was_cwd)
######################################################################
# Tests
#
# Each test must return on success or raise on failure.
def shelve_text_mods(sbox):
"shelve text mods"
def modifier(sbox):
sbox.simple_append('A/mu', 'appended mu text')
shelve_unshelve(sbox, modifier)
#----------------------------------------------------------------------
def shelve_prop_changes(sbox):
"shelve prop changes"
def modifier(sbox):
sbox.simple_propset('p', 'v', 'A')
sbox.simple_propset('p', 'v', 'A/mu')
shelve_unshelve(sbox, modifier)
#----------------------------------------------------------------------
def shelve_adds(sbox):
"shelve adds"
def modifier(sbox):
sbox.simple_append('A/new', 'A new file\n')
sbox.simple_add('A/new')
sbox.simple_append('A/new2', 'A new file\n')
sbox.simple_add('A/new2')
sbox.simple_propset('p', 'v', 'A/new2')
shelve_unshelve(sbox, modifier)
#----------------------------------------------------------------------
@XFail()
@Issue(4709)
def shelve_deletes(sbox):
"shelve deletes"
def modifier(sbox):
sbox.simple_rm('A/mu')
shelve_unshelve(sbox, modifier)
#----------------------------------------------------------------------
def shelve_from_inner_path(sbox):
"shelve from inner path"
def modifier(sbox):
sbox.simple_append('A/mu', 'appended mu text')
sbox.build()
was_cwd = os.getcwd()
os.chdir(sbox.ospath('A'))
sbox.wc_dir = '..'
modifier(sbox)
shelve_unshelve_verify(sbox)
os.chdir(was_cwd)
#----------------------------------------------------------------------
def shelve_ignores_external_diff(sbox):
"shelve ignores external diff"
def modifier(sbox):
sbox.simple_append('A/mu', 'appended mu text')
sbox.build()
was_cwd = os.getcwd()
os.chdir(sbox.ospath('A'))
sbox.wc_dir = '..'
# Configure an external 'diff-cmd' that doesn't print a diff to stdout.
# (This path needs an explicit directory component to avoid searching.)
diff_script_path = os.path.join('.', 'diff')
svntest.main.create_python_hook_script(diff_script_path, 'import sys\n'
'for arg in sys.argv[1:]:\n print(arg)\n')
if sys.platform == 'win32':
diff_script_path = "%s.bat" % diff_script_path
config_dir_path = sbox.get_tempname(prefix="config-dir")
os.mkdir(config_dir_path)
with open(os.path.join(config_dir_path, "config"), "w") as config_file:
config_file.write("[helpers]\n"
"diff-cmd = %s\n" % diff_script_path)
modifier(sbox)
shelve_unshelve_verify(sbox, global_opts=("--config-dir", config_dir_path))
os.chdir(was_cwd)
########################################################################
# Run the tests
# list all tests here, starting with None:
test_list = [ None,
shelve_text_mods,
shelve_prop_changes,
shelve_adds,
shelve_deletes,
shelve_from_inner_path,
shelve_ignores_external_diff,
]
if __name__ == '__main__':
svntest.main.run_tests(test_list)
# NOTREACHED
### End of file.
|
